Kubernetes Submit Queue
096dd4df50
Merge pull request #26510 from AdoHe/patch_test
...
Automatic merge from submit-queue
update strategic patch test for merge list of maps
Refer #26418 for more details. @janetkuo the test case is added, ptal.
2016-08-15 20:38:22 -07:00
David McMahon
ef0c9f0c5b
Remove "All rights reserved" from all the headers.
2016-06-29 17:47:36 -07:00
AdoHe
d06a77065a
update strategic patch test for merge list of maps
2016-05-30 01:43:36 -04:00
Jordan Liggitt
37c86041ca
Preserve int64 data when patching
2016-04-11 16:23:28 -04:00
goltermann
34d4eaea08
Fixing several (but not all) go vet errors. Most are around string formatting, or unreachable code.
2016-03-22 17:26:50 -07:00
jackgr
b11dec7aec
Implement conflict detection in strategic merge patch.
2015-12-06 17:54:32 -08:00
jackgr
ddda379b1b
Add method to apply strategic merge patch.
2015-10-07 17:14:11 -07:00
deads2k
05e84fafbe
move HasConflicts to shareable location
2015-10-05 14:37:57 -04:00
jackgr
3ecb1bac83
Add method to create strategic merge patch.
2015-09-10 14:01:07 -07:00
Manan Saraf
86025129fb
Fixed pointers bug in PATCH verb in the API
2015-06-16 13:31:49 -07:00
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
Sam Ghods
2c977db1b3
Implement Strategic Merge Patch in apiserver
2015-04-03 11:51:02 -07:00
