tree 8c25399d9816daadb49c0d25ad76085a74fae9e3
parent f32949c100f24ac22b2535ac34ee013f0898b3a4
parent 755741ee9ff7e432857b66de585bba7e450e72be
author Pingping Lin <pingping@onlab.us> 1465498444 +0000
committer Pingping Lin <pingping@onlab.us> 1465498444 +0000

Merge branch 'master' of https://github.com/open-cloud/xos into open-cloud-master

Conflicts:
	xos/configurations/mcord/nodes.yaml