2308 Commits

Author	SHA1	Message	Date
Justin Findlay	baca0bd5cf	Merge pull request #23136 from basepi/merge-forward-develop ... Merge forward from 2015.2 to develop	2015-04-28 12:00:23 -06:00
Colton Myers	d9cede5e27	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop ... Conflicts: salt/modules/win_file.py	2015-04-28 09:52:30 -06:00
Kevin Boulain	e6c9cc9a83	fix tests for the parted module	2015-04-28 16:50:33 +02:00
Justin Findlay	3df2a8e88d	Merge pull request #23128 from jayeshka/rest_service-unit-test ... adding rest_service unit test case	2015-04-28 08:16:54 -06:00
Jayesh Kariya	975ea49808	adding rest_service unit test case	2015-04-28 18:06:55 +05:30
Jayesh Kariya	4b7be9ffb8	adding rest_package unit test case	2015-04-28 18:04:43 +05:30
Colton Myers	befb666623	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop ... Conflicts: salt/modules/mongodb.py salt/utils/http.py salt/utils/process.py tests/integration/__init__.py	2015-04-27 10:28:53 -06:00
Justin Findlay	bcad307c38	Merge pull request #23084 from jayeshka/rbenv-unit-test ... adding rbenv unit test case	2015-04-27 09:29:54 -06:00
Justin Findlay	7daffb11f0	Merge pull request #23083 from jayeshka/chef-states-unit-test ... adding states/chef unit test case	2015-04-27 09:29:02 -06:00
Justin Findlay	846f8b7ffb	Merge pull request #23082 from jayeshka/boto_sqs-states-unit-test ... adding states/boto_sqs unit test case	2015-04-27 09:26:25 -06:00
Justin Findlay	fc6ca0c117	Merge pull request #23081 from jayeshka/boto_sns-states-unit-test ... adding states/boto_sns unit test case	2015-04-27 09:25:57 -06:00
Justin Findlay	ba9f6fb2a7	Merge pull request #23080 from jayeshka/boto_route53-states-unit-test ... adding states/boto_route53 unit test case	2015-04-27 09:25:29 -06:00
Jayesh Kariya	a96e914a08	adding rbenv unit test case	2015-04-27 17:26:24 +05:30
Jayesh Kariya	13a4cd8a30	adding states/chef unit test case	2015-04-27 17:08:56 +05:30
Jayesh Kariya	7a34457405	adding states/boto_sqs unit test case	2015-04-27 17:07:06 +05:30
Jayesh Kariya	82c5d1f68b	adding states/boto_sns unit test case	2015-04-27 17:05:34 +05:30
Jayesh Kariya	64adc959b1	adding states/boto_route53 unit test case	2015-04-27 17:03:33 +05:30
Jayesh Kariya	23cc26a1a8	adding states/boto_lc unit test case	2015-04-27 17:01:26 +05:30
rallytime	8d5b50e17c	Don't forget the blank lines at the end of the file	2015-04-24 16:29:51 -06:00
Justin Findlay	6efef05d27	Merge pull request #23036 from jfindlay/merge_23017 ... adding states/boto_elasticache unit test	2015-04-24 13:47:27 -06:00
Jayesh Kariya	06979ca744	adding states/boto_elb unit test	2015-04-24 12:07:41 -06:00
Jayesh Kariya	eda40c4b33	adding states/boto_elasticache unit test	2015-04-24 12:05:24 -06:00
Colton Myers	313c46501d	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop ... Conflicts: salt/auth/pam.py salt/modules/boto_route53.py salt/state.py	2015-04-24 10:19:03 -06:00
Justin Findlay	f9bdf6347d	Merge pull request #23019 from jayeshka/boto_iam_role-states-unit-test ... adding states/boto_iam_role unit test case	2015-04-24 08:42:51 -06:00
Jayesh Kariya	49894795ad	adding raet_publish unit test case	2015-04-24 17:30:24 +05:30
Jayesh Kariya	93214d0441	adding states/boto_iam_role unit test case	2015-04-24 17:21:28 +05:30
Thomas S Hatch	4d57a2d7c0	Merge pull request #22962 from cachedout/remove_gitpillar_update ... Remove update() in git pillar	2015-04-23 21:45:54 -06:00
Thomas S Hatch	9a1a55850a	Merge pull request #22963 from garethgreenaway/verify_schedule_functions_with_events ... Additions to schedule module	2015-04-23 21:45:25 -06:00
Colton Myers	035ad549d5	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop ... Conflicts: salt/modules/schedule.py salt/utils/schedule.py	2015-04-23 13:00:35 -06:00
Nicole Thomas	cf9041744a	Merge pull request #22985 from jfindlay/apache_state_test ... fix failing apache state unit test	2015-04-23 09:18:23 -06:00
Justin Findlay	340dba3210	Merge pull request #22982 from jayeshka/qemu_img-unit-test ... adding qemu_img unit test case	2015-04-23 08:18:46 -06:00
Justin Findlay	10fa7eea14	Merge pull request #22980 from jayeshka/boto_elb-states-unit-test ... Boto elb states unit test	2015-04-23 08:16:44 -06:00
Justin Findlay	34453b314e	fix failing apache state unit test	2015-04-23 08:09:15 -06:00
Jayesh Kariya	b9188aea6a	adding qemu_img unit test case	2015-04-23 18:13:27 +05:30
Jayesh Kariya	d347bb4e3b	changes as per 2015.2 branch	2015-04-23 17:58:08 +05:30
Jayesh Kariya	06bf61822d	changes as per 2015.2 branch	2015-04-23 17:56:04 +05:30
Jayesh Kariya	6ef51d1b2d	adding states/boto_elb unit test case	2015-04-23 17:29:19 +05:30
Jayesh Kariya	2c03692d04	adding states/boto_elasticache unit test case	2015-04-23 17:27:28 +05:30
Gareth J. Greenaway	503bd89b59	lint	2015-04-22 22:02:49 -07:00
Gareth J. Greenaway	58bce28f14	fixing various things that caused unit tests to fail. updating unit tests based on code changes	2015-04-22 21:30:58 -07:00
Jayesh Kariya	ed5f483bb4	adding states/boto_ec2 unit test case	2015-04-22 16:46:39 -06:00
Mike Place	bb49244c37	Fix test	2015-04-22 16:28:09 -06:00
Colton Myers	1a38b4b834	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop ... Conflicts: salt/cli/salt.py salt/client/mixins.py salt/renderers/pyobjects.py	2015-04-22 11:07:01 -06:00
Justin Findlay	2589e15e5c	Merge pull request #22938 from jayeshka/powerpath-unit-test ... adding powerpath unit test case	2015-04-22 08:51:39 -06:00
Justin Findlay	a70fa267b1	Merge pull request #22936 from jayeshka/boto_dynamodb-states-unit-test ... adding states/boto_dynamodb unit test case	2015-04-22 08:49:52 -06:00
Justin Findlay	ce1a880025	Merge pull request #22935 from jayeshka/boto_cloudwatch_alarm-states-unit-test ... adding states/boto_cloudwatch_alarm unit test case	2015-04-22 08:48:19 -06:00
Jayesh Kariya	5a5c7ef415	adding powerpath unit test case	2015-04-22 17:38:44 +05:30
Jayesh Kariya	650435ec44	adding states/boto_dynamodb unit test case	2015-04-22 16:17:29 +05:30
Jayesh Kariya	4e5a101647	adding states/boto_cloudwatch_alarm unit test case	2015-04-22 16:15:54 +05:30
Jayesh Kariya	f78374e34a	adding states/boto_asg unit test case	2015-04-22 16:13:14 +05:30