tree 93b056b3847127dc5b3feb71baa08417be050434
parent e48c1e091d305c173e694f2c8f265c1f0df555da
parent dadf682ea8397a2a690a58482bb8a5686380eefc
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