6 Commits

Author	SHA1	Message	Date
GONG Jie	049bb0ac64	Remove trailing spaces in file xCAT-test/autotest/testcase/updatenode/cases0	2017-12-31 23:59:59 +00:00
Weihua Hu	3e9acb10d2	fix bug of test case updatenode_syncfile_MERGE (#5049)	2018-04-03 17:43:49 +08:00
caomengmeng	cc9ac639de	complete	2016-10-25 05:11:02 -04:00
caomengmeng	86c81a0e9d	deal with conflict	2016-01-12 01:56:53 -05:00
caomengmeng	cb2e77f015	complete v1	2015-12-10 01:11:50 -05:00
litingt@cn.ibm.com	c97f34b3b0	add syncfile cases	2015-09-29 04:45:48 -04:00