7 Commits (b1357da473ff2f50857e29c3c5ab993fb1454322)

Author	SHA1	Message	Date
ymqytw	a910284e17	extract util used by jsonmergepatch and SMPatch	2017-02-03 15:28:42 -08:00
Dr. Stefan Schimanski	d7eb3b6870	pkg/util: move uuid and strategicpatch into k8s.io/apimachinery	2017-01-25 19:45:09 +01:00
deads2k	6a4d5cd7cc	start the apimachinery repo	2017-01-11 09:09:48 -05: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