diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2013-07-27 17:19:47 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2013-07-27 17:19:47 -0500 |
| commit | aa230853296cd3b69f0296d646daf37b4b2cd764 (patch) | |
| tree | 8ad1a2e8ee5f05ef775c2536984440a0cc74ec78 /osx | |
| parent | 08f5ad7e1b470b79ce81130b2f299426b132db80 (diff) | |
| parent | 3435963a7c715bd3e6e912c6224fc8b893b1abe4 (diff) | |
| download | bcfg2-aa230853296cd3b69f0296d646daf37b4b2cd764.tar.gz bcfg2-aa230853296cd3b69f0296d646daf37b4b2cd764.tar.bz2 bcfg2-aa230853296cd3b69f0296d646daf37b4b2cd764.zip | |
Merge branch 'maint'
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Conflicts:
doc/appendix/guides/ubuntu.txt
src/lib/Bcfg2/Options.py
src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
src/lib/Bcfg2/settings.py
Diffstat (limited to 'osx')
0 files changed, 0 insertions, 0 deletions