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

4 Commits (d28f7031a178220aa1e5b8fde3e7dd7a8d5a9fd6)

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
David McMahon ef0c9f0c5b Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
deads2k 05e84fafbe move HasConflicts to shareable location 2015-10-05 14:37:57 -04:00
Janet Kuo 5a608446ba pull "kubectl edit" from openshift upstream 2015-09-15 19:16:23 -07:00