3 Commits (50b9d6284a3b844bc19b64edec9984fb4657aea6)

Author	SHA1	Message	Date
Eric Paris	6b3a6e6b98	Make copyright ownership statement generic ... Instead of saying "Google Inc." (which is not always correct) say "The Kubernetes Authors", which is generic.	2015-05-01 17:49:56 -04:00
Daniel Smith	78b8f9599f	Fix another license problem.	2015-04-03 17:06:29 -07:00
Sam Ghods	2c977db1b3	Implement Strategic Merge Patch in apiserver	2015-04-03 11:51:02 -07:00