Commit Graph

13 Commits

Author SHA1 Message Date
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
jhadvig
f7785bcdb4 Typo fix 2015-12-02 13:59:58 +01: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
feihujiang
51f59f3c78 Fix the wrong path of document 2015-09-17 20:38:08 +08:00
jackgr
3ecb1bac83 Add method to create strategic merge patch. 2015-09-10 14:01:07 -07:00
Mike Danese
8e33cbfa28 rewrite go imports 2015-08-05 17:30:03 -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
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