diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2014-06-10 13:54:03 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2014-06-10 13:54:03 -0500 |
| commit | 70d618b9dc3a3784e9a84aa242157e1ade102216 (patch) | |
| tree | 093d25de0edbe5c69534aa7033fc3c40b0cf94ae /doc/server | |
| parent | 3d1b2b3a2d549a69e6a997b042020ff113c6f86b (diff) | |
| parent | 9b36d0bf226e19baf50c45faac601effb8c17090 (diff) | |
| download | bcfg2-70d618b9dc3a3784e9a84aa242157e1ade102216.tar.gz bcfg2-70d618b9dc3a3784e9a84aa242157e1ade102216.tar.bz2 bcfg2-70d618b9dc3a3784e9a84aa242157e1ade102216.zip | |
Merge branch 'maint'
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Conflicts:
doc/server/plugins/structures/bundler/index.txt
src/lib/Bcfg2/Server/Admin/Init.py
src/lib/Bcfg2/Server/Plugins/GroupLogic.py
src/lib/Bcfg2/Server/Plugins/Properties.py
src/lib/Bcfg2/Server/Plugins/Reporting.py
Diffstat (limited to 'doc/server')
| -rw-r--r-- | doc/server/plugins/structures/bundler/index.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/server/plugins/structures/bundler/index.txt b/doc/server/plugins/structures/bundler/index.txt index 0b6b8eb50..5bcf467e7 100644 --- a/doc/server/plugins/structures/bundler/index.txt +++ b/doc/server/plugins/structures/bundler/index.txt @@ -1,4 +1,5 @@ .. -*- mode: rst -*- +.. vim: ft=rst .. _server-plugins-structures-bundler-index: |