github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-12 01:59:05 +00:00
Code Issues Projects Releases Wiki Activity
20,216 Commits 42 Branches 8,159 Tags
3da15535b6c87e0bb8246f026cb15a21c4d05933
Commit Graph

6 Commits

Author SHA1 Message Date
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