Commit Graph

1669 Commits

Author SHA1 Message Date
Pedro Algarvio
de4a9fefa4 Py3 compatibility fixes 2015-01-30 22:25:12 +00:00
Pedro Algarvio
63dc6ae7d5 Py3 compatibility fixes 2015-01-30 22:25:12 +00:00
Pedro Algarvio
0037eda794 Py3 compatibility fixes 2015-01-30 22:25:12 +00:00
Pedro Algarvio
6d04942a96 Py3 compatibility fixes 2015-01-30 22:25:12 +00:00
Pedro Algarvio
fd040355c5 Py3 compatibility fixes 2015-01-30 22:25:12 +00:00
Pedro Algarvio
d3acb194df Py3 compatibility fixes 2015-01-30 22:25:11 +00:00
Pedro Algarvio
5242e7217a Py3 compatibility fixes 2015-01-30 22:25:11 +00:00
Pedro Algarvio
f13718f11c Py3 compatibility fixes 2015-01-30 22:25:11 +00:00
Pedro Algarvio
72654ad0a9 Py3 compatibility fixes 2015-01-30 22:25:11 +00:00
Pedro Algarvio
85b66a47c5 Py3 compatibility fixes 2015-01-30 22:25:11 +00:00
Pedro Algarvio
a8ff8fa0b5 Py3 compatibility fixes 2015-01-30 22:25:11 +00:00
Pedro Algarvio
8081170d8d Py3 compatibility fixes 2015-01-30 22:25:11 +00:00
Pedro Algarvio
0ead7d0f9b Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
Pedro Algarvio
a8bc298260 Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
Pedro Algarvio
282aeb1d35 Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
Pedro Algarvio
fee4a62c87 Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
Pedro Algarvio
e0549ca602 Fix import 2015-01-30 22:25:06 +00:00
Pedro Algarvio
c3d922bdc4 Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
0726464344 Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
1a779fd51c Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
309876eac1 Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
f3bc5bdb49 Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
53a5f4beb8 Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
Thomas S Hatch
dc8aecc4d3 Merge pull request #20252 from jayeshka/incron-unit-test
adding incron unit test case
2015-01-30 10:38:27 -07:00
Thomas S Hatch
7f72eb9fb8 Merge pull request #20251 from jayeshka/ilo-unit-test
adding ilo unit test case
2015-01-30 10:38:09 -07:00
Thomas S Hatch
487394ac30 Merge pull request #20249 from rupeshta/logadm_unit_tests
implemented unit test cases for logadm module
2015-01-30 10:37:41 -07:00
Thomas S Hatch
b407b62a38 Merge pull request #20248 from rupeshta/localemod_unit_tests
implemented unit test cases for localemod module
2015-01-30 10:37:28 -07:00
Thomas S Hatch
dc09c54702 Merge pull request #20247 from rupeshta/launchctl_unit_tests
implemented unit test cases for launchctl module
2015-01-30 10:37:18 -07:00
Jayesh Kariya
378d9656d9 adding incron unit test case 2015-01-30 18:38:56 +05:30
Jayesh Kariya
9a48449d01 adding ilo unit test case 2015-01-30 18:36:58 +05:30
Rupesh Tare
24536cca64 implemented unit test cases for logadm module 2015-01-30 18:28:17 +05:30
Rupesh Tare
3e2b08ca4f implemented unit test cases for localemod module 2015-01-30 18:22:27 +05:30
Rupesh Tare
2c07dbedb9 implemented unit test cases for launchctl module 2015-01-30 18:17:03 +05:30
rallytime
9898fcf613 Merge branch '2015.2' into 'develop'
Conflicts:
	.gitignore
	.pylintrc
	.testing.pylintrc
	salt/client/mixins.py
	salt/cloud/clouds/msazure.py
	salt/config.py
	salt/modules/mount.py
	salt/runners/doc.py
	salt/utils/event.py
	salt/utils/reactor.py
2015-01-29 17:24:04 -07:00
rallytime
c65d9673a7 Merge branch '2014.7' into merge_forward_fifteen_second_try
Conflicts:
	salt/states/file.py
2015-01-29 13:42:49 -07:00
Thomas S Hatch
50aeea25a2 Merge pull request #20183 from jayeshka/htpasswd-unit-test
adding htpasswd unit test case
2015-01-29 10:39:55 -07:00
Thomas S Hatch
6a6bc56958 Merge pull request #20181 from jayeshka/hipchat-unit-test
adding hipchat test case
2015-01-29 10:39:36 -07:00
Thomas S Hatch
9698e49930 Merge pull request #20180 from jayeshka/guestfs-unit-test
adding guestfs unit test case
2015-01-29 10:39:20 -07:00
Thomas S Hatch
b469df1b28 Merge pull request #20172 from jacksontj/develop
Fix for #20170
2015-01-29 10:32:38 -07:00
Mike Place
d772ddb2bf Add some logging to flaky test
We need to see what's happening in the echo server to figure out why
this occasionally fails.
2015-01-29 10:27:31 -07:00
Jayesh Kariya
0b1bade648 resolved the error 2015-01-29 16:00:21 +05:30
Jayesh Kariya
8cedb4b71d adding htpasswd unit test case 2015-01-29 14:49:32 +05:30
Jayesh Kariya
2ab996d135 adding hipchat test case 2015-01-29 14:25:25 +05:30
Jayesh Kariya
acf1f5ffc6 adding guestfs unit test case 2015-01-29 14:18:38 +05:30
Thomas Jackson
975dee5bdd Remove test as well 2015-01-28 17:25:35 -08:00
Thomas S Hatch
0b47a56773 Merge pull request #20000 from terminalmage/fix-19552
Better check for pillar for jinja templating
2015-01-28 14:35:56 -07:00
Nicole Thomas
16da23c5e7 Merge pull request #20139 from jayeshka/drbd-unit-test
adding drbd unit test case
2015-01-28 12:40:58 -07:00
Nicole Thomas
a717549c4e Merge pull request #20116 from rallytime/merge_forward_to_fifteen
Merge 2014.7 into 2015.2
2015-01-28 12:15:08 -07:00
Nicole Thomas
be9cac8fd1 Merge pull request #20146 from rupeshta/key_unit_tests
implemented unit test cases for key module
2015-01-28 12:13:00 -07:00