Merge branch 'master' into fix-typos

This commit is contained in:
bin liu
2016-07-04 11:20:47 +08:00
3744 changed files with 41155 additions and 14988 deletions

View File

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