4168 Commits

Author	SHA1	Message	Date
Colton Myers	ae05e70e94	Merge pull request #24802 from basepi/merge-forward-2015.5 ... [2015.5] Merge forward from 2014.7 to 2015.5	2015-06-18 14:11:58 -06:00
twangboy	98e7e90299	Fixed test failures for Colton	2015-06-18 12:58:18 -06:00
Justin Anderson	179ce03d93	Revert "adding states/postgres_database unit test case."	2015-06-18 10:24:11 -06:00
C. R. Oldham	1a158e8a3b	Merge pull request #24792 from rallytime/bp-24757 ... Back-port #24757 to 2015.5	2015-06-18 09:58:35 -06:00
C. R. Oldham	0f9298263b	Merge pull request #24768 from jfindlay/pkg_mod ... fix yum versionlock on RHEL/CentOS 5, disable corresponding test	2015-06-18 09:13:12 -06:00
Mike Place	6c804f0789	Fix loader call in pyobjects	2015-06-18 09:11:45 -06:00
Mike Place	fd7339014b	Merge pull request #24782 from jayeshka/slack-states-unit-test ... adding states/slack unit test case.	2015-06-18 08:33:55 -06:00
Jayesh Kariya	e2b6214764	adding states/slack unit test case.	2015-06-18 15:47:27 +05:30
Thomas Jackson	b1211c5422	Re-enable tests for complex prereq and prereq_in ... Since #24770 is fixed, #8211 is also fixed (since they are basically the same issue)	2015-06-17 21:57:37 -07:00
Justin Findlay	7a26c2b5b9	disable pkg.hold test for RHEL/CentOS 5	2015-06-17 16:36:36 -06:00
Mike Place	a407ab7c51	Merge pull request #24329 from jayeshka/postgres_database-states-unit-test ... adding states/postgres_database unit test case.	2015-06-17 13:11:02 -06:00
Jayesh Kariya	1a4c241050	adding states/serverdensity_device unit test case.	2015-06-17 16:50:40 +05:30
Grischa Meyer	68fb5af970	fixing other test	2015-06-16 14:23:58 -06:00
Grischa Meyer	ba4f262b9c	fixing text for virtual support in pyobjects	2015-06-16 14:23:58 -06:00
Jayesh Kariya	0c136fd9c2	adding states/selinux unit test case.	2015-06-16 17:11:44 +05:30
Jayesh Kariya	54aaaa5f12	adding states/schedule unit test case.	2015-06-15 17:16:21 +05:30
Justin Findlay	01092c2337	Merge pull request #24628 from jayeshka/reg_states-unit-test ... adding states/reg unit test case.	2015-06-12 11:29:11 -06:00
Jayesh Kariya	af1bd8f9ff	adding states/reg unit test case.	2015-06-12 17:23:41 +05:30
Justin Findlay	d88fb22fdc	fix pkg module integration tests on CentOS 5	2015-06-11 14:56:52 -06:00
Justin Findlay	fb91b40ba0	fix pkg module integration tests on ubuntu 12	2015-06-11 12:46:22 -06:00
Justin Findlay	5a21ad152e	Merge pull request #24593 from jayeshka/redismod_states-unit-test ... adding states/redismod unit test case.	2015-06-11 09:55:27 -06:00
Justin Findlay	8ffb86edd0	Merge pull request #24581 from rallytime/disable_some_flaky_tests ... Disabled some flaky tests until we can figure out how to make them more reliable	2015-06-11 09:51:41 -06:00
Jayesh Kariya	3b95744840	adding states/redismod unit test case.	2015-06-11 17:42:15 +05:30
Thomas S Hatch	a570d7f967	Merge pull request #24566 from jayeshka/rdp_states-unit-test ... adding states/rdp unit test case.	2015-06-10 20:14:39 -06:00
rallytime	c82f135d2e	Disabled some flaky tests until we can figure out how to make them more reliable	2015-06-10 14:04:14 -06:00
Jayesh Kariya	273b994e91	adding states/rdp unit test case.	2015-06-10 18:41:29 +05:30
Joe Julian	cfc3b43ba2	Don't pollute the TZ environment variable	2015-06-09 14:26:27 -07:00
Joe Julian	76e2583265	Merge tls changes from develop	2015-06-09 12:48:36 -07:00
Justin Findlay	73e6388acd	Merge pull request #24495 from jayeshka/rabbitmq_vhost_states-unit-test ... adding states/rabbitmq_vhost unit test case.	2015-06-09 09:33:23 -06:00
Justin Findlay	bf1abccebe	Merge pull request #24445 from jayeshka/pyrax_queues_states-unit-test ... adding states/pyrax_queues unit test case.	2015-06-09 09:28:45 -06:00
Jayesh Kariya	31889e38eb	cosmetic change.	2015-06-09 19:44:16 +05:30
Jayesh Kariya	cf501cf60d	resolved error.	2015-06-09 18:10:37 +05:30
Jayesh Kariya	4bb6087722	Merge branch '2015.5' of https://github.com/saltstack/salt into rabbitmq_vhost_states-unit-test	2015-06-09 18:09:05 +05:30
Nicole Thomas	fce998a58b	Merge pull request #24497 from jayeshka/rbenv_states-unit-test ... adding states/rbenv unit test case.	2015-06-08 21:56:09 -06:00
Jayesh Kariya	79d343a62b	adding states/rbenv unit test case.	2015-06-08 18:24:24 +05:30
Jayesh Kariya	3ad77143a8	adding states/rabbitmq_vhost unit test case.	2015-06-08 18:23:15 +05:30
Jayesh Kariya	7d96f27f91	adding states/rabbitmq_user unit test case.	2015-06-08 17:47:04 +05:30
Colton Myers	c0ff4110ab	Merge pull request #24398 from makinacorpus/aptv ... VirtualName for states.apt	2015-06-05 11:40:04 -06:00
Justin Findlay	36263405be	Merge pull request #24447 from jayeshka/rabbitmq_policy_states-unit-test ... adding states/rabbitmq_policy unit test case.	2015-06-05 09:26:10 -06:00
Jayesh Kariya	9b038abd63	adding states/rabbitmq_policy unit test case.	2015-06-05 17:35:31 +05:30
Jayesh Kariya	cb0c99a012	adding states/rabbitmq_plugin unit test case.	2015-06-05 17:33:49 +05:30
Jayesh Kariya	ea27cefb10	adding states/pyrax_queues unit test case.	2015-06-05 17:32:19 +05:30
Mathieu Le Marec - Pasquet	785d27707f	VirtualName for states.apt ... This fixes #24397 Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>	2015-06-05 09:45:52 +02:00
Justin Findlay	deaee68b89	Merge pull request #24371 from joejulian/2015.5_tls_module_tests ... 2015.5 tls module tests	2015-06-04 09:20:16 -06:00
Justin Findlay	84686ee695	Merge pull request #24403 from jayeshka/process_states-unit-test ... adding states/process unit test case.	2015-06-04 09:19:01 -06:00
Justin Findlay	35de8d72db	Merge pull request #24402 from jayeshka/pyenv_states-unit-test ... adding states/pyenv unit test case.	2015-06-04 09:18:11 -06:00
Justin Findlay	632f838838	Merge pull request #24401 from jayeshka/powerpath-states-unit-test ... adding states/powerpath unit test case.	2015-06-04 09:17:46 -06:00
Jayesh Kariya	5f263ab48b	adding states/pyenc unit test case.	2015-06-04 17:50:04 +05:30
Jayesh Kariya	fcb71fb35e	adding states/process unit test case.	2015-06-04 17:49:04 +05:30
Jayesh Kariya	49ff9272ce	adding states/powerpath unit test case.	2015-06-04 17:47:39 +05:30