xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-19 09:40:21 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into skeleton

Browse Source 
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
This commit is contained in:
Victor Hu
2015-08-13 23:13:31 -04:00
parent 902710490c af9368827a
commit b2d87962a3
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/guides/admin-guides/basic_concepts/xcat_object/group.rst Normal file
View File

@@ -0,0 +1,2 @@
``group``
=========

1
source/guides/admin-guides/basic_concepts/xcat_object/index.rst
View File

@@ -6,4 +6,5 @@ Objects
node.rst
osimage.rst
group.rst
nodegroup.rst

1
source/guides/admin-guides/basic_concepts/xcat_object/node.rst
View File

@@ -3,4 +3,3 @@
Node Range
----------