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

source

Merge branch 'master' into skeleton

2015-08-13 23:13:31 -04:00

make.bat

Preparing files to be merged from xcat_doctest to xcat-docs

2015-07-16 15:29:16 -04:00

Makefile

Roll back the change that changed the location of build

2015-08-10 20:58:09 -04:00

S

Description

No description provided

EPL-1.0 235 MiB

Languages

Perl 76.3%

Shell 11.5%

JavaScript 6.8%

Go Template 2.6%

Python 1.7%

Other 0.7%