github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
35,667 Commits
32 Branches
881 Tags
633 MiB
Commit Graph

20 Commits (d55006d38f6806ff77d4e30c1e897a2b9bdcb8e4)

Author SHA1 Message Date
PingWang 121f6fb289 change all jsonmerge to strategicpatch 
Signed-off-by: PingWang <wang.ping5@zte.com.cn>

update preconditions define

Signed-off-by: PingWang <wang.ping5@zte.com.cn>
 2016-09-09 08:28:10 +08:00
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
k8s-merge-robot 4da14c8a64 Merge pull request #28204 from thockin/cleanup-third_party 
Automatic merge from submit-queue

Cleanup third party (pt 2)

Move forked-and-hacked golang code to the forked/ directory.  Remove ast/build/parse code that is now in stdlib.  Remove unused shell2junit
 2016-07-07 12:13:14 -07:00
David McMahon ef0c9f0c5b Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
Tim Hockin 8c42c08363 move forked golang code to a common dir with LICENSE 2016-06-28 22:57:45 -07:00
AdoHe d06a77065a update strategic patch test for merge list of maps 2016-05-30 01:43:36 -04:00
AdoHe 04c0103c4a fix strategy patch diff list issue 2016-05-27 08:42:33 -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
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