539 Commits

Author	SHA1	Message	Date
Colton Myers	bdfdd3f232	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: salt/modules/virt.py	2015-03-11 16:09:57 -06:00
Vincent Desjardins	d5293901bc	fixes #20198: virt.get_graphics and virt.get_nics calls in module virt	2015-03-10 09:17:48 -06:00
Colton Myers	8c1fa5358e	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: salt/modules/debian_ip.py salt/modules/file.py salt/states/ssh_auth.py salt/utils/cloud.py	2015-03-09 11:50:21 -06:00
Thomas Jackson	9fa37fd46b	Add raw boolean support to depends decorator	2015-03-05 21:59:10 -08:00
Thomas S Hatch	17a76a8e86	Merge pull request #21083 from cachedout/request_test ... Fix error in state.request	2015-03-03 10:00:14 -07:00
Justin Findlay	a6b86ef627	indent quoted code in cmdmod tests	2015-03-02 16:08:49 -07:00
C. R. Oldham	00942f2060	Merge forward 2014.7->2015.2	2015-03-01 17:55:25 -07:00
Erik Johnson	5573b18624	Fix more py3-incompatible print statements	2015-02-28 12:15:16 -06:00
Erik Johnson	93e1805c14	Lint fix	2015-02-28 12:13:41 -06:00
Erik Johnson	84de5b23af	Merge pull request #21160 from terminalmage/lint-2015.2 ... Don't use print statement without parenthesis (py3 compat)	2015-02-28 11:49:13 -06:00
Erik Johnson	afb8439c1f	update test_valid_docs	2015-02-28 11:47:12 -06:00
Erik Johnson	86937eedc4	Don't use print statement without parenthesis (py3 compat) ... This backports a lint fix from #21158 into the tests for 2015.2.	2015-02-28 11:41:51 -06:00
Justin Findlay	17b8f73f1b	add cmd module integration tests	2015-02-27 16:30:05 -07:00
Justin Findlay	3397dc5540	fix state request tests	2015-02-27 16:15:26 -07:00
Justin Findlay	68f06aae51	add integration test for #18317	2015-02-27 14:53:53 -07:00
Justin Findlay	3b7ba92089	adding cmd.run integration tests	2015-02-27 14:53:53 -07:00
Justin Findlay	5dace8f688	add integration test for #18317	2015-02-24 16:25:57 -07:00
Justin Findlay	5ab5380094	adding cmd.run integration tests	2015-02-23 16:35:07 -07:00
Colton Myers	c3b7be0655	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: doc/topics/installation/rhel.rst salt/output/__init__.py salt/utils/__init__.py	2015-02-20 13:51:59 -07:00
rallytime	c3f786c966	listen and listen_in requisite tests	2015-02-19 16:13:23 -07:00
rallytime	1437c9a1f5	onfail and onfail_in requisite tests	2015-02-19 14:35:26 -07:00
rallytime	208b4906d8	Onchanges and onchanges_in requisite tests!	2015-02-19 13:06:38 -07:00
rallytime	8f0e80bd66	Add one onchanges requisite test	2015-02-18 17:16:07 -07:00
Justin Findlay	b39f962369	add state module requested state run tests ... closes #16901	2015-02-17 14:23:14 -07:00
Erik Johnson	706ce858b4	Disable LXC integration tests for now	2015-02-10 15:06:47 -06:00
Erik Johnson	f18a23c284	Ignore lack of CLI example in deprecated function	2015-02-10 15:06:47 -06:00
rallytime	69d7a6ebd0	Pylint fixes for the 2015.2 branch	2015-01-23 10:57:18 -07:00
Thomas S Hatch	9cdbf2b2f7	Merge pull request #19972 from rallytime/bp-19746 ... Backport #19746 to 2015.2	2015-01-22 17:55:27 -07:00
Mathias Gug	dd097b730d	Fix style issues.	2015-01-22 14:40:49 -07:00
Mathias Gug	4542072c4e	Add boto_sns module and state. ... Include integration tests.	2015-01-22 14:40:32 -07:00
Mathias Gug	a454d71bd5	Fix coding style.	2015-01-22 14:24:30 -07:00
Mathias Gug	adf4c7a1af	Skip boto_iam integration tests if boto is not available ... or properly configured.	2015-01-22 14:24:30 -07:00
Mathias Gug	6a18c71f1d	Add comment.	2015-01-22 14:24:29 -07:00
Mathias Gug	0d158cfa12	Add get_account_id function boto_iam ... so that we can retrieve the AWS account id associated with the credentials used to connect to AWS.	2015-01-22 14:24:29 -07:00
Colton Myers	3ce5eb2838	Merge branch '2014.7' into merge-forward-2015.2 ... Conflicts: salt/modules/archive.py salt/modules/brew.py salt/modules/pip.py tests/unit/modules/archive_test.py tests/unit/modules/pip_test.py	2015-01-09 11:39:09 -07:00
rallytime	ea769829af	Fix my pylint errors	2015-01-08 15:09:55 -07:00
rallytime	41841701e7	Fix djangomod.py integration test failures	2015-01-08 12:57:11 -07:00
Colton Myers	70489c62a7	Merge branch '2014.7' into merge-forward-2015.2 ... Conflicts: salt/modules/cron.py salt/modules/rabbitmq.py salt/modules/smf.py salt/modules/upstart.py salt/modules/useradd.py salt/modules/zpool.py salt/pillar/git_pillar.py	2015-01-07 14:49:58 -07:00
rallytime	4e87557748	--local is not available in older versions of git ... Also adjust the tests: subprocess.check_output is only available in python 2.7	2015-01-07 11:56:43 -07:00
Seth House	e96654744f	Added test for git_pillar branch to env mappings	2015-01-06 16:51:58 -07:00
Colton Myers	f6eae029f0	Merge branch '2014.7' into merge-forward-2015.2 ... Conflicts: pkg/windows/installer/Salt-Minion-Setup.nsi salt/grains/core.py salt/minion.py salt/modules/mongodb.py salt/states/archive.py salt/states/mount.py salt/utils/master.py salt/utils/schedule.py salt/utils/thin.py tests/jenkins-ng.py	2015-01-06 13:14:27 -07:00
rallytime	57514d824b	Fix pylint on 2014.7 branch	2015-01-03 21:44:09 -07:00
Justin Findlay	4748156ed9	update cmdmod integration tests	2014-12-23 13:59:25 -07:00
Mike Place	67150306b6	Fix version test	2014-12-15 13:13:42 -07:00
Pedro Algarvio	a985f0ac4e	Disable some Pylint errors	2014-12-01 03:23:52 +00:00
Pedro Algarvio	14cc8931ed	Disable some Pylint errors	2014-11-28 15:30:05 +00:00
Pedro Algarvio	bfe99dbb3f	Merge branch '2014.7' into develop ... Conflicts: salt/cloud/__init__.py salt/modules/file.py salt/modules/zcbuildout.py salt/runners/lxc.py salt/runners/manage.py	2014-11-26 20:14:56 +00:00
Pedro Algarvio	2a597da207	Switch open() for salt.utils.fopen()	2014-11-26 17:47:05 +00:00
Pedro Algarvio	6b72255e9b	Switch open() for salt.utils.fopen()	2014-11-26 17:46:13 +00:00
Pedro Algarvio	a802d8f7f5	Use the skip_if_binaries_missing_helper	2014-11-20 16:40:38 +00:00