Pedro Algarvio
94f9184f51
urllib2 has been moved to urllib. Six to the rescue.
2015-04-25 00:47:54 +01:00
Pedro Algarvio
5b3a6672f5
Py3 compatibility fixes
2015-04-25 00:37:13 +01:00
Pedro Algarvio
da717c0769
Switch to rich comparison for Py3 support
...
Fixes #20014
2015-04-25 00:34:41 +01:00
Nicole Thomas
6cddb19e11
Merge pull request #23032 from jfindlay/BaseException.message
...
BaseException.message
2015-04-24 12:38:27 -06:00
Justin Findlay
e86e974614
Merge pull request #23029 from basepi/merge-forward-2015.2
...
[2015.2] Merge forward from 2014.7 to 2015.2
2015-04-24 11:37:59 -06:00
Justin Findlay
5b489ac473
convert jboss7 BaseException.message
2015-04-24 11:08:40 -06:00
Justin Findlay
5035c5d210
convert netscalar BaseException.message
2015-04-24 11:08:29 -06:00
Justin Findlay
a919b3c5c2
convert mongodb BaseException.message
2015-04-24 11:08:19 -06:00
Justin Findlay
07cf9232f1
convert lxc BaseException.message
2015-04-24 11:08:01 -06:00
Justin Findlay
742b8deec6
convert boto_elb BaseException.message
2015-04-24 11:07:44 -06:00
Justin Findlay
095c09d828
convert artifactory BaseException.message
2015-04-24 11:07:31 -06:00
Justin Findlay
8681585bd8
convert cloudstack BaseException.message
2015-04-24 11:07:15 -06:00
Colton Myers
a18e017619
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/man/salt.1
doc/ref/cli/salt.rst
2015-04-24 10:07:48 -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
Justin Findlay
588579b124
Merge pull request #23020 from jayeshka/raet_publish-unit-test
...
adding raet_publish unit test case
2015-04-24 08:42:20 -06:00
Justin Findlay
7747f3342e
Merge pull request #23015 from hvnsweeting/set-non-error-lvl-for-service-status-log
...
if status of service is stop, there is not an error with it
2015-04-24 08:35:10 -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
Viet Hung Nguyen
92ea163513
if status of service is stop, there is not an error with it
...
e.g when using service.dead, we will not want an error log for that
2015-04-24 15:28:36 +07:00
Thomas S Hatch
2e09789156
Merge pull request #23000 from jfindlay/systemd_kill
...
set systemd service killMode to process for minion
2015-04-23 21:42:39 -06:00
Justin Findlay
b5c059ab26
Merge pull request #22999 from jtand/fix_22707
...
Added retry_dns to minion doc.
2015-04-23 21:30:24 -06:00
Justin Findlay
80621eb9ce
Merge pull request #23002 from rallytime/remove_requests_dep
...
Remove python-requests dependency from debian/control
2015-04-23 21:29:47 -06:00
rallytime
cc3999e006
Remove python-requests dependency from debian/control
2015-04-23 17:04:17 -06:00
Justin Findlay
3d575e29c4
set systemd service killMode to process for minion
...
Fixes #22993 .
The change is only made for the minion process because, theoretically,
only the minion could create the problem described. salt-master and
salt-syndic do not theoretically spawn non-salt processes during the
lifetime of their processes, whereas salt-minion does this by design.
The default behavior for systemd killMode seems to be control-group,
which means all processes that share the same control group as the
minion process will also be killed by systemd when the minion service is
stopped (killed).
It is reasonable to expect that activity done on a system by a salt
minion should persist beyond the lifetime of the minion process, so
let's not kill procs that the minion starts even when the minion exits.
2015-04-23 16:18:19 -06:00
Nicole Thomas
1d9230cb8f
Merge pull request #22952 from basepi/merge-forward-2015.2
...
[2015.2] Merge forward from 2014.7 to 2015.2
2015-04-23 15:56:44 -06:00
Justin
8486e17ab3
Added retry_dns to minion doc.
2015-04-23 15:33:59 -06:00
Colton Myers
8de3dceeec
Revert "Initialize state file client after pillar loading"
...
This reverts commit 31b98e72eb
2015-04-23 14:09:22 -06:00
Nicole Thomas
27dc877bfd
Merge pull request #22990 from techhat/2014.7
...
Use the proper cloud conf variable
2015-04-23 11:48:07 -06:00
Thomas S Hatch
6391053926
Merge pull request #22972 from whiteinge/scheduler-once
...
Added 'once' support to the scheduler
2015-04-23 10:26:55 -06:00
Thomas S Hatch
59d0626928
Merge pull request #22975 from whiteinge/salt-api-misc
...
Add a new html tool to rest_cherrypy; fix oversight from #22970
2015-04-23 10:26:09 -06:00
Joseph Hall
d33bcbc2c1
Use the proper cloud conf variable
2015-04-23 10:09:05 -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
c50bf4ec50
Merge pull request #22979 from jayeshka/boto_elasticache-states-unit-test
...
Boto elasticache states unit test
2015-04-23 08:15:40 -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
Justin Findlay
13dff652c6
Merge pull request #22976 from multani/fix/state-output-doc
...
Improve state_output documentation
2015-04-23 06:24:22 -06:00
Justin Findlay
f2eb8c509a
Merge pull request #22978 from makinacorpus/file
...
Fix file.managed absent source error
2015-04-23 06:19:26 -06:00
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
Mathieu Le Marec - Pasquet
73178d7a61
Fix file.managed absent source error
2015-04-23 11:43:13 +02:00
Jonathan Ballet
19efd419b5
Improve state_output documentation
...
List all the available settings in the documentation and on the command
line.
Also, make the documentation clearer about the different possibilities.
2015-04-23 10:22:11 +02:00
Seth House
eceacad9c4
Added favicon support to avoid 404s
2015-04-23 02:12:12 -06:00
Seth House
de976756d5
Switch is_master_running() to be a private method
...
The list of available clients is generated from the public methods on
the class.
2015-04-23 02:00:51 -06:00
Seth House
b24cbc68d5
Added rest_cherrypy tool to serve HTML the root URL
2015-04-23 01:58:33 -06:00
Justin Findlay
7fdfa4c3fd
Merge pull request #22970 from whiteinge/salt-api-503-support
...
Add support to salt-api to detect a downed master and return 503s
2015-04-22 23:10:22 -06:00
Seth House
4328b1839d
Added 'once' support to the scheduler
2015-04-22 21:56:41 -06:00
