summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git.mcs.anl.gov:bcfg2Narayan Desai2011-05-10185-3214/+14729
|\
| * man: Fix typos reported by emias on IRCSol Jerome2011-05-101-2/+2
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * SSHbase: Fix PY3K tracebacks for known_hosts fileSol Jerome2011-05-101-1/+1
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * Logger: Fix non-string loggingSol Jerome2011-05-101-10/+13
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * Logger: Statement always was True in python 2Sol Jerome2011-05-091-15/+10
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * Logger: Use bytes for PY3KSol Jerome2011-05-091-1/+3
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * Merge pull request #30 from trehn/masterSol Jerome2011-05-092-0/+2
| |\ | | | | | | import sys for SGenshi and Bundler
| | * add yet another missing sys importTorsten Rehn2011-05-091-0/+1
| | |
| | * add another missing sys importTorsten Rehn2011-05-091-0/+1
| | |
| * | Merge pull request #29 from trehn/plugin-ldap-dev-trehnSol Jerome2011-05-091-1/+10
| |\ \ | | | | | | | | Two small fixes for Ldap plugin
| | * | log more useful error message if python-ldap is not installedTorsten Rehn2011-05-091-1/+9
| | | |
| | * | add missing sys importTorsten Rehn2011-05-091-0/+1
| | | |
| * | | Upstart: Fix typo reported by justintime on IRCSol Jerome2011-05-091-1/+1
| | |/ | |/| | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * | DBStats: Stop duplicating data in reports_reasonTim Laszlo2011-05-091-6/+3
| |/
| * Merge pull request #28 from rcuza/masterSol Jerome2011-05-073-2/+6
| |\ | | | | | | Ticket 1008 Resolution Patches plus a Preflight Cleanup Modification
| | * Add missing import sys.Raul Cuza2011-05-061-0/+1
| | |
| | * Pass keypath to create_conf function.Raul Cuza2011-05-061-2/+2
| | |
| | * Add missing import.Raul Cuza2011-05-061-0/+1
| | |
| | * Merge branch 'tkt1007'Raul Cuza2011-05-061-0/+2
| |/|
| | * Change preflight script to clean up man{1,5} files as well as man8Raul Cuza2011-05-051-0/+2
| | |
| * | TCheetah: Fix local variable bug reported by trehn on IRCSol Jerome2011-05-061-3/+3
| | | | | | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * | TGenshi: Fix local variable bug reported by trehn on IRCSol Jerome2011-05-061-3/+4
| | | | | | | | | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com> (cherry picked from commit 071ef1a1fbe6368b1abb81855e1ab95e316e6911)
| * | Fixed several bugs with last commit. Sorry, I'm a doofus.Chris St. Pierre2011-05-061-11/+10
| | |
| * | added documentation about NagiosGen config backwards-compatChris St. Pierre2011-05-061-1/+4
| | |
| * | Rewrote NagiosGen config to use NagiosGen/config.xml, whichChris St. Pierre2011-05-065-89/+228
| |/ | | | | | | | | | | | | | | | | | | | | | | understands <Group> and <Client> tags, rather than the client-specific Properties/NagiosGen.xml and the group-specific but limited NagiosGen/parents.xml. Includes schema and bcfg2-lint updates necessary. Wrote conversion tool, nagiosgen-convert.py, which converts everything but the <default/> tag in the old NagiosGen.xml, which cannot be reasonably converted to StructFile format. Also removed a _lot_ of string modification in NagiosGen.py, which should make it a fair bit faster.
| * Merge https://github.com/rcuza/bcfg2Sol Jerome2011-05-053-3/+19
| |\
| | * Correct minor typo in man page.Raul Cuza2011-05-051-1/+1
| | |
| | * Add flag to mkdir to make Makefile easier to use.Raul Cuza2011-05-051-2/+2
| | |
| | * Add a file with introduction to bcfg2.Raul Cuza2011-05-051-0/+16
| | | | | | | | | | | | The introduction is just a copy of the front page of the bcfg2.org wiki.
| * | doc: Add mention of python-ssl alternative to m2cryptoSol Jerome2011-05-051-17/+20
| | | | | | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * | Core: Raise error on failed lxml import (Reported by Raul Cuza on IRC)Sol Jerome2011-05-054-3/+13
| |/ | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * made bcfg2-lint error handling configurable on a much more granular levelChris St. Pierre2011-05-0511-120/+230
| |
| * Packages: Solve byte string incompatibility in a different waySol Jerome2011-05-031-1/+1
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * Merge branch 'py3k'Sol Jerome2011-05-0328-247/+305
| |\
| | * Common: Fixes to get server to start with PY3KSol Jerome2011-05-032-25/+26
| | | | | | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| | * Plugins: Handle builtin file type for PY3KSol Jerome2011-05-032-10/+19
| | | | | | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| | * Fix regressions with new py3k codeSol Jerome2011-05-032-1/+2
| | | | | | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| | * bcfg2: Fix typosSol Jerome2011-04-291-2/+2
| | | | | | | | | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com> (cherry picked from commit beb08649193f2c799017024bb738dc31b3420cb2)
| | * Client/Tools: Get rid of popen2 (in favor of subprocess)Sol Jerome2011-04-282-46/+8
| | | | | | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| | * Py3k Compat: Add fixes for various importsSol Jerome2011-04-271-8/+43
| | | | | | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| | * Fix some syntax issuesSol Jerome2011-04-272-3/+3
| | | | | | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| | * src/sbin: Add full PY3K compatibilitySol Jerome2011-04-278-109/+128
| | | | | | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| | * Common: Add full PY3K compatibilitySol Jerome2011-04-277-30/+45
| | | | | | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| | * Admin: Add full PY3K compatibilitySol Jerome2011-04-267-15/+31
| | | | | | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| | * Reports: Fix settings parserSol Jerome2011-04-261-1/+1
| | | | | | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * | Reports: Fix settings parserSol Jerome2011-04-291-1/+1
| |/ | | | | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com> (cherry picked from commit cca5e6a474adf1453408909979143233d54ed2be) (cherry picked from commit 493eb728e35ca8e851bd686232182ea4b227c637)
| * Snapshots: Fix missing colon (Reported by emias on IRC)Sol Jerome2011-04-261-1/+1
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * Plugins: Fix import and indent errorsSol Jerome2011-04-262-1/+2
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * Plugins: Add full PY3K compatibilitySol Jerome2011-04-2620-76/+169
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * Consolidate PY3K compatibility librariesSol Jerome2011-04-2611-42/+28
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>