diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-17 13:21:12 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-17 13:21:12 -0500 |
| commit | ee2a04a2df209be96ad1e3b5ff68e6c875bcbaa7 (patch) | |
| tree | 6030148c47a58ff0ad9792dbb42ab314cb6c29ff /doc | |
| parent | 19d20b6f254c67ab2de4a932f1e5bbb0e30dc1f3 (diff) | |
| parent | 988a58f949ac1771f7f805a1bf45e8895ab6f884 (diff) | |
| download | bcfg2-ee2a04a2df209be96ad1e3b5ff68e6c875bcbaa7.tar.gz bcfg2-ee2a04a2df209be96ad1e3b5ff68e6c875bcbaa7.tar.bz2 bcfg2-ee2a04a2df209be96ad1e3b5ff68e6c875bcbaa7.zip | |
Merge branch '1.3.1' into 1.4.x
Conflicts:
doc/server/plugins/generators/cfg.txt
src/lib/Bcfg2/Server/Admin/Snapshots.py
src/lib/Bcfg2/Server/Core.py
src/lib/Bcfg2/Server/Plugin/helpers.py
src/lib/Bcfg2/Server/Plugins/Bundler.py
src/lib/Bcfg2/Server/Plugins/FileProbes.py
src/lib/Bcfg2/Server/Plugins/NagiosGen.py
src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py
src/lib/Bcfg2/Server/models.py
testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/development/cfg.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/development/cfg.txt b/doc/development/cfg.txt index 6533e0d7a..c3b8d12af 100644 --- a/doc/development/cfg.txt +++ b/doc/development/cfg.txt @@ -58,7 +58,6 @@ exceptions: Global Variables ================ -.. autodata:: Bcfg2.Server.Plugins.Cfg.SETUP .. autodata:: Bcfg2.Server.Plugins.Cfg.CFG Existing Cfg Handlers |