bcfg2 - Custom fork of bcfg2 (configuration management)

	Commit message (Expand)	Author	Age	Files	Lines
*	Svn: Fixing pep8 check	Jason Kincl	2013-06-17	1	-0/+1
*	Svn: Fixing pep8 and pylint checks	Jason Kincl	2013-06-17	1	-10/+13
*	Svn: Tidying up code and logging of subversion trust and user/pass options	Jason Kincl	2013-06-17	1	-8/+15
*	Svn: Adding config options for specifying a user and password for subversion ...	Jason Kincl	2013-06-17	1	-0/+28
*	Svn: fixed conflict resolution callback, log level	Chris St. Pierre	2012-12-05	1	-3/+3
*	Svn: cleaned up conflict resolution stuff	Chris St. Pierre	2012-12-04	1	-30/+39
*	Future-proofed conflict option selection	Jason Kincl	2012-12-03	1	-13/+9
*	fixing logic so try..except works correctly, bugs	Jason Kincl	2012-11-28	1	-7/+4
*	adding doc, changing variable names	Jason Kincl	2012-11-27	1	-3/+3
*	fixing syntax	Jason Kincl	2012-11-27	1	-1/+1
*	log actions better	Jason Kincl	2012-11-27	1	-0/+3
*	fixing line lengths	Jason Kincl	2012-11-27	1	-1/+2
*	fixing bugs	Jason Kincl	2012-11-27	1	-5/+6
*	adding svn_resolution to global namespace	Jason Kincl	2012-11-27	1	-2/+2
*	adding svn merge resolution map	Jason Kincl	2012-11-27	1	-3/+27
*	Merge remote branch 'upstream/master' into jasons-hacking	Jason Kincl	2012-11-27	1	-2/+1
\|\
\| *	fixed vcs_root/vcs_path for Version plugins, esp. Svn	Chris St. Pierre	2012-11-19	1	-2/+1
* \|	minor typo and function documentation	Jason Kincl	2012-11-19	1	-2/+3
* \|	Adding a default conflict resolver of theirs-full to Svn Plugin	Jason Kincl	2012-11-07	1	-0/+4
\|/
*	added Git.Update RMI, ability to base bcfg2 VCS repo at a different directory...	Chris St. Pierre	2012-10-30	1	-21/+112
*	run pylint for errors on almost everything, full runs on some selected stuff	Chris St. Pierre	2012-09-25	1	-25/+13
*	Allow to run directly from a git checkout (#1037)	Sol Jerome	2012-03-24	1	-0/+46