Commit Graph

1903 Commits

Author SHA1 Message Date
Arthur Lutz
592e0a1402 [modules/postgresql] modules for cluster management in postgresql (debian specific)
related to  #21293
2015-03-04 18:33:20 +01:00
Jayesh Kariya
323c195bcc adding win_timezone unit test case 2015-03-03 18:46:53 +05:30
Erik Johnson
94d55889d7 Resolve merge conflicts 2015-02-28 12:35:25 -06:00
rallytime
b01196e7e8 Add transport key to mocked opts to fix batch unit tests 2015-02-27 14:53:58 -07:00
Pedro Algarvio
62f868a076 Merge branch '2015.2' into develop 2015-02-27 10:02:47 +00:00
rallytime
cd5ad52c2e Fix pylint errors on develop 2015-02-26 09:43:52 +00:00
Pedro Algarvio
a24ae29ee9 Revert "We no longer warn."
This reverts commit 5d35f856ac.
2015-02-26 09:41:22 +00:00
Mike Place
b4bd491f8e Merge pull request #20981 from makinacorpus/psql
postgres: role update support
2015-02-25 09:35:15 -07:00
Mike Place
dd17969b7b Merge pull request #21018 from jayeshka/win_ntp-unit-test
adding win_ntp unit test case
2015-02-25 09:19:37 -07:00
Jayesh Kariya
d7a0ca956d adding win_shadow unit test case 2015-02-25 18:48:05 +05:30
Jayesh Kariya
5e851b3789 adding win_ntp unit test case 2015-02-25 18:46:45 +05:30
jfindlay
35f1266c86 Merge pull request #20968 from jayeshka/win_firewall-unit-test
adding win_firewall unit test case
2015-02-24 16:23:40 -07:00
Mathieu Le Marec - Pasquet
126e29c3eb pgsql: fix tests 2015-02-24 21:01:13 +01:00
Thomas S Hatch
cd072876b7 Merge pull request #20942 from cachedout/context_cache
Context cache
2015-02-24 11:30:11 -07:00
Jayesh Kariya
d5b70b5fea adding win_firewall unit test case 2015-02-24 18:58:55 +05:30
jfindlay
a38c17efde Merge pull request #20901 from aspyatkin/feature-bower
Add Bower execution and state modules
2015-02-23 21:40:10 -07:00
Mike Place
26b3ec0be3 Context cache decorator 2015-02-23 19:27:27 -07:00
Colton Myers
c8eb2d4665 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
	doc/topics/installation/windows.rst
	salt/cloud/clouds/joyent.py
	salt/daemons/flo/core.py
	salt/minion.py
2015-02-23 14:25:51 -07:00
rallytime
0e57d8fe6e Fix pylint errors on develop 2015-02-23 12:24:53 -07:00
rallytime
c0cad91549 Fix unit test 2015-02-21 19:29:57 -07:00
Pedro Algarvio
c85d38c493 Merge pull request #20893 from cvrebert/pylint-enable
re-enable pylint instead of disabling it twice
2015-02-21 08:29:16 +00:00
Chris Rebert
ea02ef58b7 re-enable pylint instead of disabling it twice 2015-02-20 23:50:30 -08:00
Alexander Pyatkin
5edb6cba11 Implement Bower state module 2015-02-21 05:57:54 +00:00
Alexander Pyatkin
c408c935a0 Implement Bower execution module 2015-02-21 05:56:20 +00:00
Chris Rebert
2a52d54a20 Avoid shadowing list type in modules.darwin_pkgutil; fixes #20120 2015-02-20 21:52:25 -08:00
Jayesh Kariya
014ce111ab adding win_autoruns unit test case 2015-02-20 19:16:09 +05:30
jfindlay
b70ffe2bb8 Merge pull request #20819 from jayeshka/slack_notify-unit-test
adding slack_notify unit test case
2015-02-19 08:21:30 -07:00
Jayesh Kariya
93d5a32bd8 adding rpm unit test case 2015-02-19 14:40:10 +05:30
Jayesh Kariya
6efb71fb6e adding slack_notify unit test case 2015-02-19 14:38:51 +05:30
Colton Myers
f00465a8a1 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
	doc/topics/event/index.rst
	salt/loader.py
	salt/modules/config.py
	salt/modules/cyg.py
	salt/modules/hg.py
	salt/modules/lxc.py
	salt/modules/upstart.py
	salt/states/hg.py
	salt/utils/cloud.py
	salt/utils/dictupdate.py
	salt/utils/schedule.py
	tests/integration/fileserver/gitfs_test.py
	tests/unit/pydsl_test.py
2015-02-18 11:55:29 -07:00
Nicole Thomas
e190909055 Merge pull request #20755 from jayeshka/modjk-unit-test
adding modjk unit test case
2015-02-17 08:38:47 -07:00
jfindlay
0c6b89e81c Merge pull request #20756 from jayeshka/npm-unit-test
adding npm unit test case
2015-02-17 08:38:26 -07:00
Nicole Thomas
c398669a6e Merge pull request #20754 from jayeshka/swift-unit-test
adding swift unit test case
2015-02-17 08:37:51 -07:00
Nicole Thomas
87b019bc8c Merge pull request #20753 from jayeshka/sdb-unit-test
adding sdb unit test case
2015-02-17 08:36:52 -07:00
jfindlay
d1068f5c14 Merge pull request #20752 from jayeshka/ret-unit-test
adding ret unit test case
2015-02-17 08:36:42 -07:00
jfindlay
1a5c187945 Merge pull request #20751 from jayeshka/openstack_config-unit-test
adding openstack_config unit test case
2015-02-17 08:35:42 -07:00
Jayesh Kariya
35a25e1ad6 adding sdb unit test case 2015-02-17 18:20:58 +05:30
Jayesh Kariya
f38fe3a34e adding ret unit test case 2015-02-17 18:19:04 +05:30
Jayesh Kariya
0e3a86f84b adding openstack_config unit test case 2015-02-17 18:17:10 +05:30
Jayesh Kariya
b25fc47126 adding npm unit test case 2015-02-17 18:14:15 +05:30
Jayesh Kariya
17796ca5b4 adding modjk unit test case 2015-02-17 18:12:01 +05:30
Jayesh Kariya
5098a63fd1 adding swift unit test case 2015-02-17 18:09:33 +05:30
Dennis Hall
478f42d9b2 Change Github to GitHub 2015-02-15 15:19:54 +01:00
jfindlay
59eaabea0a Merge pull request #20688 from rallytime/bp-20125
Backport #20125 to 2015.2
2015-02-13 11:46:21 -07:00
rallytime
1f7d257767 Add some python 3 compatibility fixes for new test files 2015-02-13 11:30:45 -07:00
Mike Place
d1d52d2245 Avoid file cache problem in pydsl tests
Using the same copy of opts was causing the cache refresh to not find
any files because they had already been cleaned up!
2015-02-13 10:48:39 -07:00
Mike Place
7a9428d9f5 Typo 2015-02-13 10:17:17 -07:00
Mike Place
37b375ba8b Use cls attr 2015-02-13 10:17:17 -07:00
Mike Place
b9fa5e4e29 Reset env at end of test 2015-02-13 10:17:17 -07:00
Nicole Thomas
47ac489d0e Merge pull request #20676 from jayeshka/rest_sample-unit-test
rest_sample unit test case
2015-02-13 08:48:21 -07:00