This change is 

/lgtm

@jessfraz: you can't LGTM a PR unless you are assigned as a reviewer.

PR for master at #39213 . PTAL

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

Jenkins unit/integration failed for commit 6fb98ac. Full PR test history.

The magic incantation to run this job again is @k8s-bot unit test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@k8s-bot gce etcd3 e2e test this

@k8s-bot unit test this

@k8s-bot test this

Tests are more than 96 hours old. Re-running tests.

@k8s-bot verify test this

@k8s-bot gce etcd3 e2e test this

Jenkins verification failed for commit 6fb98ac. Full PR test history.

The magic incantation to run this job again is @k8s-bot verify test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

Jenkins GCE etcd3 e2e failed for commit 6fb98ac. Full PR test history.

The magic incantation to run this job again is @k8s-bot gce etcd3 e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@thockin , it seems we need to update Copyright from 2016 to 2017, any comments?

diff --git a/pkg/util/sets/string.go b/pkg/util/sets/string.go
index da66eaf8e7..baef7a6a2b 100644
--- a/pkg/util/sets/string.go
+++ b/pkg/util/sets/string.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2016 The Kubernetes Authors.
+Copyright 2017 The Kubernetes Authors.

Rebase to upstream master - it's fixed there

oops, this is the release branch. Ugh, what a mess. @jessfraz - should we touch all the generated files to update dates (bogus_ or live with broken tests? :)

oh yeah I'll cherrypick the patch for the dates

ok i merged the pr to fix the dates

@k8s-bot verify test this please

@k8s-bot gce etcd3 e2e test this

all green merging

Commit found in the "release-1.4" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.