Merge pull request #25500 from mml/2016

Automatic merge from submit-queue

It's 2016, yo.
This commit is contained in:
k8s-merge-robot
2016-05-13 14:24:57 -07:00
39 changed files with 39 additions and 39 deletions

View File

@@ -1,5 +1,5 @@
/*
Copyright 2015 The Kubernetes Authors All rights reserved.
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.