summaryrefslogtreecommitdiffstats
path: root/doc/appendix
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2013-07-18 09:45:10 -0500
committerSol Jerome <sol.jerome@gmail.com>2013-07-18 09:45:10 -0500
commit1405be5d896d7ae539044f28565de48095cceec8 (patch)
treefa51d61777aac8adc72cc55bca64efa744fa7ac0 /doc/appendix
parenta7c2a14cfecf93d013556dcb703abb8e36bb45e5 (diff)
parent259c84f9ddaaf0233a65e686bd8f3346ab0972b0 (diff)
downloadbcfg2-1405be5d896d7ae539044f28565de48095cceec8.tar.gz
bcfg2-1405be5d896d7ae539044f28565de48095cceec8.tar.bz2
bcfg2-1405be5d896d7ae539044f28565de48095cceec8.zip
Merge branch 'maint'
Signed-off-by: Sol Jerome <sol.jerome@gmail.com> Conflicts: src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py src/lib/Bcfg2/Server/Plugins/Packages/Yum.py src/lib/Bcfg2/Server/Plugins/Properties.py
Diffstat (limited to 'doc/appendix')
-rw-r--r--doc/appendix/tools.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/appendix/tools.txt b/doc/appendix/tools.txt
index 1d7a8dd90..92bde683b 100644
--- a/doc/appendix/tools.txt
+++ b/doc/appendix/tools.txt
@@ -11,4 +11,4 @@ can help you to maintain your Bcfg2 configuration, to make the initial
setup easier, or to do some other tasks.
-http://trac.mcs.anl.gov/projects/bcfg2/browser/tools
+https://github.com/Bcfg2/bcfg2/tree/maint/tools