46356 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Joseph Hall	969315bbda	Merge pull request #20415 from shahn/develop ... Update Macports Portfile	2015-02-05 12:18:08 -07:00
Joseph Hall	6539930a7b	Merge pull request #20427 from kaithar/issue/mysql-null-test-fix ... Fix for mysql pillar's ignore_null	2015-02-05 12:17:33 -07:00
Joseph Hall	cf2bc2d9c0	Merge pull request #20402 from cachedout/issue_19643 ... Copy perms of destination file when backing up	2015-02-05 12:08:30 -07:00
Joseph Hall	7da1181899	Merge pull request #20367 from robmessick/gem_list_upgrades ... Add list_upgrades method to salt.modules.gem	2015-02-05 12:07:09 -07:00
Joseph Hall	4932cf6596	Merge pull request #20414 from borgstrom/pyobjects-import-as ... Update documentation & tests following #18911	2015-02-05 12:02:17 -07:00
Joseph Hall	ab9ec6ba76	Merge pull request #20359 from patrickshan/develop ... ignore null string from blkid output	2015-02-05 11:55:22 -07:00
Kaithar	529f4f6ae2	Compare against None rather than basing off anything that evaluates true	2015-02-05 17:28:45 +00:00
Nicole Thomas	be9e00f316	Merge pull request #20413 from rallytime/pylint_dev ... Fix remaining pylint errors on develop	2015-02-05 08:50:43 -07:00
rallytime	c25e88b9e1	Don't forget the pylint ignore	2015-02-05 08:06:18 -07:00
Sebastian Hahn	122e253960	Update Macports Portfile ... This update came out of a discussion on the macports bug available at https://trac.macports.org/ticket/46107.	2015-02-05 07:22:54 +01:00
Evan Borgstrom	a43920bffc	Update documentation & tests following #18911 ... Thanks for the contribution @tomashavlas! Please make sure you update the tests & documentation in the future.	2015-02-04 21:27:24 -08:00
rallytime	02d3235cf2	Fix remaining pylint errors on develop	2015-02-04 21:11:17 -07:00
Mike Place	51f2e94334	Copy perms of destination file when backing up ... Fixes #19643	2015-02-04 15:26:35 -07:00
Nicole Thomas	ced4bfccf1	Merge pull request #20380 from rallytime/merge-20374 ... Merge #20374 with some fixes	2015-02-04 11:24:14 -07:00
rallytime	e882a6dec4	Merge #20374 with some fixes	2015-02-04 08:52:33 -07:00
Rupesh Tare	535247d805	implemented unit test cases for match module	2015-02-04 18:33:35 +05:30
Rupesh Tare	a1efeb59be	implemented unit test cases for lvs module	2015-02-04 18:30:44 +05:30
Pedro Algarvio	b77880a111	Some pylint disables	2015-02-04 12:01:18 +00:00
Pedro Algarvio	62e9407903	Merge pull request #20349 from rallytime/develop_pylint ... Develop pylint	2015-02-04 11:58:39 +00:00
Rob Messick	4a042114ee	Add method list_upgrades (modeled on the salt.modules.pip). Calls 'gem outdated' and returns a dictionary containing gem names and the version number of the latest gem.	2015-02-03 20:39:29 -08:00
Rob Messick	70be021ebd	Log and raise CommandExecutionError if gem command retcode != 0	2015-02-03 19:43:48 -08:00
Rob Messick	0375df0f38	import logging and setup logger	2015-02-03 18:50:38 -08:00
Nicole Thomas	bc0cbb7447	Merge pull request #20354 from jfindlay/fix_iptables_test ... Fix iptables test	2015-02-03 15:27:48 -07:00
Nicole Thomas	9937702767	Merge pull request #20338 from pakdel/mssql ... MS SQL Execution module	2015-02-03 14:03:31 -07:00
Justin Findlay	334245170a	add mocks to fix test when iptables cmd is absent	2015-02-03 13:22:22 -07:00
Justin Findlay	cc2f6c9c54	normalizing iptables.check for easier testing	2015-02-03 13:22:14 -07:00
Amir Pakdel	633586481e	PyLint adjustments in modules/mssql.py	2015-02-03 15:10:18 -05:00
rallytime	a55001565b	Add list to six.iteritems	2015-02-03 12:54:49 -07:00
rallytime	ec25dc1047	Python 3 compat for mixins.py and http.py	2015-02-03 12:22:05 -07:00
Mike Place	c0a10789eb	Merge pull request #20281 from MrMarvin/fix/eauth_group_permissions_mess ... fixes a bug which broke eauth with group permissions	2015-02-03 12:18:55 -07:00
Mike Place	168df9d3ad	Merge pull request #20339 from salekseev/fix/fluent_log_handler_race_condition ... Fixed race condition in fluent_log_handler	2015-02-03 12:12:25 -07:00
Nicole Thomas	f82e2fd6b9	Merge pull request #20343 from rallytime/fix_keyboard_tests ... Make sure all exits are blocked and mocked	2015-02-03 11:44:30 -07:00
Amir Pakdel	f6a4457f7c	Even more PyLint adjustments in modules/mssql.py	2015-02-03 13:42:03 -05:00
rallytime	2f9dc14af1	More Python 3 compat changes to new test modules	2015-02-03 11:40:27 -07:00
rallytime	244ba09cfc	Python 3 compat for several new test files	2015-02-03 11:34:49 -07:00
rallytime	d2d42e522f	Python 3 compat and additions to ldapmod_test	2015-02-03 11:28:03 -07:00
rallytime	79e6ea90b1	Python 3 compat for sudo.py	2015-02-03 11:25:24 -07:00
rallytime	fab28bb1ed	Python 3 compat for mixins.py	2015-02-03 11:22:51 -07:00
rallytime	c523448420	Python 3 compatability for schedule.py	2015-02-03 11:15:45 -07:00
Amir Pakdel	e50e4953bc	PyLint adjustments in modules/mssql.py	2015-02-03 12:41:20 -05:00
rallytime	19680fc6a4	Make sure all exits are blocked and mocked	2015-02-03 10:28:29 -07:00
Amir Pakdel	576c518dd9	PyLint adjustments in modules/mssql.py	2015-02-03 11:59:49 -05:00
Stas Alekseev	32d0e8d028	Fixed race condition in fluent_log_handler	2015-02-03 11:20:07 -05:00
Ana Paez	2a617ea8da	Added db_* and user_* functions to mssql module	2015-02-03 10:37:56 -05:00
Amir Pakdel	eabb8a262c	Added MS SQL execution module	2015-02-03 10:02:09 -05:00
Thomas S Hatch	bb58c37c58	Merge pull request #20333 from errge/patch-1 ... Fix ambiguity and typo in test.fib documentation	2015-02-03 06:20:31 -07:00
Thomas S Hatch	e742d995ea	Merge pull request #20332 from westurner/patch-2 ... DOC: topics/tutorials/walkthrough.rst: then > than	2015-02-03 06:20:10 -07:00
Thomas S Hatch	20bbd01bc8	Merge pull request #20331 from jayeshka/etcd_mod-unit-test ... adding etcd_mod unit test case	2015-02-03 06:19:43 -07:00
Thomas S Hatch	46b3a24947	Merge pull request #20330 from jayeshka/memcached-unit-test ... adding memcached unit test case	2015-02-03 06:19:33 -07:00
Thomas S Hatch	9fe7c36964	Merge pull request #20327 from jayeshka/ldapmod-unit-test ... adding ldapmod unit test case	2015-02-03 06:18:40 -07:00