2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-05 21:10:09 +00:00
Victor Hu b2d87962a3 Merge branch 'master' into skeleton
Conflicts:
	docs/source/guides/admin-guides/basic_concepts/network_planning/network_service/index.rst
	docs/source/guides/admin-guides/basic_concepts/xcat_object/index.rst
	docs/source/guides/admin-guides/basic_concepts/xcat_object/node.rst

Merging code added by commit d13fd1bd9e1334ba52b6707a8181e0beb244c59f
2015-08-13 23:13:31 -04:00
..