github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-07 02:56:03 +00:00
Code Issues Projects Releases Wiki Activity
39,660 Commits 42 Branches 8,159 Tags
6b4657883266aaf51a1a8607ffc8b8045285c8e5
Commit Graph

5 Commits

Author SHA1 Message Date
Mike Danese
3b6a067afc autogenerated 2016-10-21 17:32:32 -07:00
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