Pedro Algarvio
|
7479e446ec
|
Py3 compatibility fixes
|
2015-01-30 22:25:02 +00:00 |
|
Pedro Algarvio
|
aaa1500e82
|
Py3 compatibility fixes
|
2015-01-30 22:25:02 +00:00 |
|
Pedro Algarvio
|
a767fef609
|
Py3 compatibility fixes
|
2015-01-30 22:25:02 +00:00 |
|
Pedro Algarvio
|
e70d34dc02
|
Py3 compatibility fixes
|
2015-01-30 22:25:02 +00:00 |
|
Pedro Algarvio
|
619b9e114f
|
Py3 compatibility fixes
|
2015-01-30 22:25:02 +00:00 |
|
Pedro Algarvio
|
d220178c47
|
Py3 compatibility fixes
|
2015-01-30 22:25:02 +00:00 |
|
Pedro Algarvio
|
fb056b41c8
|
Py3 compatibility fixes
|
2015-01-30 22:25:02 +00:00 |
|
Pedro Algarvio
|
268788bbff
|
Py3 compatibility fixes
|
2015-01-30 22:25:01 +00:00 |
|
Pedro Algarvio
|
ccf573b8d2
|
Py3 compatability fixes
|
2015-01-30 22:25:01 +00:00 |
|
Pedro Algarvio
|
31da005e02
|
Update pylintrc to load the python 3 modernize plugin
|
2015-01-30 22:25:01 +00:00 |
|
Joseph Hall
|
4ce02f960d
|
Merge pull request #20263 from JohannesEbke/develop
Make AssociatePublicIpAddress work to fix #19288
|
2015-01-30 14:12:04 -07:00 |
|
Nicole Thomas
|
d83f54c506
|
Merge pull request #20265 from rallytime/pylint_develop
Fix pylint on develop
|
2015-01-30 12:58:39 -07:00 |
|
rallytime
|
4648530a50
|
Fix pylint on develop
|
2015-01-30 12:56:52 -07:00 |
|
Mike Place
|
b69a46b9ad
|
Merge pull request #20262 from cachedout/tornado_error
If tornado is not installed, raise error that will be seen
|
2015-01-30 11:05:59 -07:00 |
|
Mike Place
|
8162411ddf
|
Also error and exit cleanly if saltnado can't be loaded
|
2015-01-30 11:02:03 -07:00 |
|
Johannes Ebke
|
6a13a44498
|
Make AssociatePublicIpAddress work to fix #19288
|
2015-01-30 19:00:38 +01:00 |
|
Mike Place
|
7cbf3d7a0d
|
If tornado is not installed, raise error that will be seen
|
2015-01-30 10:54:18 -07:00 |
|
Thomas S Hatch
|
aa791d4ac2
|
Merge pull request #20257 from makinacorpus/arghotfix
Only softfail with a state kwarg mismatch
|
2015-01-30 10:53:35 -07:00 |
|
Mathieu Le Marec - Pasquet
|
81212b436f
|
state kw mismatch: increase to critical loglevel
|
2015-01-30 18:51:20 +01:00 |
|
Thomas S Hatch
|
f4b1688ad8
|
Merge pull request #20253 from rbjorklin/fix_docker_pulled_double_tag
Fixed problem with tags occuring twice with docker.pulled
|
2015-01-30 10:40:04 -07: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 |
|
Thomas S Hatch
|
267d16505f
|
Merge pull request #20230 from rallytime/merge_forward_develop
Merge 2015.2 into develop
|
2015-01-30 10:33:59 -07:00 |
|
Thomas S Hatch
|
f494de935c
|
Merge pull request #20216 from steverweber/return_docs
fix returning docs when some minions did not return
|
2015-01-30 10:31:45 -07:00 |
|
Thomas S Hatch
|
77198d4a53
|
Merge pull request #20222 from jacksontj/develop
More specific error message.
|
2015-01-30 10:29:39 -07:00 |
|
Thomas S Hatch
|
2b2d98d301
|
Merge pull request #20236 from joejulian/develop
Issue #20235: blockdev.format fails when succeeding
|
2015-01-30 10:17:01 -07:00 |
|
Thomas S Hatch
|
9bbc256f5f
|
Merge pull request #20175 from makinacorpus/c
runner: Force mminion loading not to clutter output
|
2015-01-30 10:05:37 -07:00 |
|
Mathieu Le Marec - Pasquet
|
f35869a99b
|
Only softfail with a state kwarg mismatch
This rels & fix #20227.
|
2015-01-30 16:50:38 +01:00 |
|
Robin Björklin
|
7497d714e7
|
Fixed problem with tags occuring twice with docker.pulled
|
2015-01-30 14:12:52 +01: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 |
|
Joe Julian
|
d83bf53555
|
Issue #20235: blockdev.format fails when succeeding
After a mkfs is issued, an immediate lsblk will show the device as
unformatted. Issuing a sync before lsblk will allow the check to
succeed.
|
2015-01-29 20:16:40 -08:00 |
|
Mike Place
|
2988b0d13f
|
Merge pull request #20232 from jacksontj/saltnado
Remove unecessary finish() calls
|
2015-01-29 19:34:53 -07:00 |
|
Thomas Jackson
|
641c76edb4
|
Remove unecessary finish() calls
finish() only needs to be called after functions with @asynchronous decorators, coroutines don't count
|
2015-01-29 17:58:30 -08:00 |
|
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 |
|
Nicole Thomas
|
34e0cab774
|
Merge pull request #20228 from rallytime/pylinting
Pylint fix for 2015.2
|
2015-01-29 16:37:10 -07:00 |
|
rallytime
|
cabf5ffd5d
|
Pylint fix for 2015.2
|
2015-01-29 16:36:27 -07:00 |
|
Thomas Jackson
|
a4e35de8a8
|
More specific error message.
The old message was misleading because if the file was missing it said "permissions error", when in fact its *any* IOError
|
2015-01-29 14:34:15 -08:00 |
|
Nicole Thomas
|
6e8e3917b3
|
Merge pull request #20219 from rallytime/backport_19829
Backport #19829 to 2015.2
|
2015-01-29 15:24:56 -07:00 |
|
Nicole Thomas
|
1632553c23
|
Merge pull request #20215 from rallytime/bp-19566
Backport #19566 to 2015.2
|
2015-01-29 15:24:16 -07:00 |
|
Nicole Thomas
|
cfaba40f4b
|
Merge pull request #20214 from rallytime/merge_forward_fifteen_second_try
Merge forward fifteen second try
|
2015-01-29 15:09:53 -07:00 |
|
Mike Place
|
fcec870e36
|
Merge pull request #20213 from cachedout/expected_args
Add username/password to expected args
|
2015-01-29 14:47:36 -07:00 |
|
Nicole Thomas
|
738a7c8c44
|
Merge pull request #20209 from rallytime/bp-20166
Backport #20166 to 2015.2
|
2015-01-29 14:29:02 -07:00 |
|
Alexander Haase
|
203b700032
|
Another pass over modules/mount.py against pylint....
|
2015-01-29 14:13:19 -07:00 |
|