Thomas S Hatch
7e7b7859b2
Add config fallback for salt-ssh to yaml_utf8
2013-12-26 14:04:40 -07:00
Thomas S Hatch
b31f42d5d8
Fix regression in salt-ssh caused by yaml utf8 check
2013-12-26 14:02:23 -07:00
David Boucha
76d027e6b0
Merge pull request #9451 from UtahDave/develop
...
add 0.17.4 windows installer links
2013-12-26 10:56:08 -08:00
David Boucha
3fbec595e1
add 0.17.4 windows installer links
2013-12-26 11:55:33 -07:00
Pedro Algarvio
0fb5be304c
Add required ending new-line
2013-12-26 18:51:30 +00:00
Thomas S Hatch
408d9a1793
lint fixes
2013-12-26 11:42:57 -07:00
Colton Myers
114df5d40b
Merge pull request #9448 from cachedout/#9440
...
Handle invalid master address in minion config
2013-12-26 10:15:42 -08:00
Joseph Hall
0458d640a1
Merge pull request #9450 from terminalmage/docs
...
Better example for versionadded/versionchanged
2013-12-26 10:14:58 -08:00
Erik Johnson
7a4a457267
Better example for versionadded/versionchanged
...
This provides a more comprehensive example than the one I originally
added here.
2013-12-26 12:12:30 -06:00
Joseph Hall
c3df565564
Merge pull request #9449 from UtahDave/develop
...
bump Salt windows installer version
2013-12-26 09:41:33 -08:00
David Boucha
21c3ff1c70
bump Salt windows installer version
2013-12-26 10:40:19 -07:00
Thomas S Hatch
bb363870c4
Merge pull request #9437 from gravyboat/develop
...
Master troubleshooting guide update regarding timeout.
2013-12-26 09:39:54 -08:00
Mike Place
f2f7e9f537
Handle invalid master address in minion config
...
Gracefully exit the minion while informing the user of the cause of the error if the IP address of the master is malformed such that it can not even be dealt with by Python's socket module.
Unit testing for the above condition.
Closes #9440 .
Remove suprious debugging statement.
Remove more spurious debugging.
2013-12-26 09:48:01 -07:00
Pedro Algarvio
f54736aab6
Merge pull request #9447 from cachedout/exception-handling-file
...
Handle a possible exception
2013-12-26 07:57:43 -08:00
Mike Place
853ac49f12
Handle a possible exception where a file source does not specify a protocol.
2013-12-26 08:44:24 -07:00
Pedro Algarvio
ddb56964e8
Merge pull request #9445 from techhat/iptables
...
Fix logic error in iptables.append
2013-12-26 06:50:12 -08:00
Martin H. J. Bramwell
ef22842e1a
Make usage of source_hash more flexible.
...
modified: salt/modules/file.py
modified: salt/states/file.py
2013-12-26 09:21:30 -05:00
Martin H. J. Bramwell
78a7c9cf12
Make usage of source_hash more flexible.
...
modified: salt/modules/file.py
modified: salt/states/file.py
2013-12-26 09:03:40 -05:00
Joseph Hall
2ebafd80eb
Fix logic error in iptables.append
2013-12-26 06:55:51 -07:00
Pedro Algarvio
fa178e0426
Merge pull request #9441 from terminalmage/docs
...
Add versionadded directives to iptables state/module functions
2013-12-26 04:17:55 -08:00
Erik Johnson
c599c09760
Add explanation of versionadded/versionchanged to style guide
2013-12-26 04:15:58 -06:00
Erik Johnson
47943992d6
Add versionadded directives to newer iptables functions
2013-12-26 03:16:25 -06:00
Erik Johnson
3c564b11c6
Add versionadded directives to iptables states
2013-12-26 03:14:05 -06:00
Forrest Alvarez
6ab38c7484
Updated the master troubleshooting doc with a note about modifying the timeout.
2013-12-26 04:01:19 +00:00
Mathieu Le Marec - Pasquet
99a2791917
Better trace for nested jinja errors
2013-12-25 18:00:15 +00:00
Joseph Hall
911840df62
Merge pull request #9435 from terminalmage/docs
...
Add new pagerduty module/state to docs
2013-12-25 07:43:38 -08:00
Erik Johnson
ddad8760a5
Add new pagerduty module/state to docs
2013-12-25 08:45:26 -06:00
Erik Johnson
aca6ca1ca6
Merge pull request #9434 from techhat/pagerduty
...
Adding execution module and state for @PagerDuty
2013-12-25 06:41:21 -08:00
Joseph Hall
c54da12336
Adding execution module and state for @PagerDuty
2013-12-25 06:15:12 -07:00
Pedro Algarvio
1c29214f74
Merge pull request #9433 from aboe76/develop
...
updated suse spec to 0.17.4
2013-12-25 04:33:37 -08:00
Seth House
e453a0ab06
Merge pull request #9432 from Cofyc/fix_exception_handling_in_ps
...
related to #9274 , another place needs exception handling
2013-12-25 02:43:26 -08:00
Seth House
17b1ad1616
Merge pull request #9431 from malept/fix-states-ordering-docs
...
Fix docs for the "Understanding State Ordering" tutorial
2013-12-25 02:43:06 -08:00
Niels Abspoel
7c817b4035
updated suse spec to 0.17.4
2013-12-25 08:42:09 +01:00
Yecheng Fu
e697d96bcf
related to #9274 , another place needs exception handling
2013-12-25 14:11:35 +08:00
Mark Lee
46ed25f195
Fix docs for the "Understanding State Ordering" tutorial
...
"code-block" directives require a blank line before them.
2013-12-24 19:41:58 -08:00
Joseph Hall
2ce4870993
Merge pull request #9430 from terminalmage/docs
...
Add new XMPP module/state to docs
2013-12-24 16:09:07 -08:00
Joseph Hall
a33abbb38e
Merge pull request #9429 from gravyboat/develop
...
Master troubleshooting guide update regarding ulimit refresh.
2013-12-24 16:08:17 -08:00
Erik Johnson
5b4356a35e
Add versionadded directive to XMPP module/state
...
Also cleaned up the RST formatting a bit
2013-12-24 17:58:50 -06:00
Erik Johnson
4f6d448af5
Add new XMPP module/state to docs
2013-12-24 17:58:09 -06:00
Forrest Alvarez
8f746fe429
Added a line explaining that the user would need to re-establish their sessions as the user they modified the limits for in the master troubleshooting guide.
2013-12-24 23:55:08 +00:00
Joseph Hall
1beb6de194
Merge pull request #9428 from gravyboat/develop
...
Update to pkg state example, and master troubleshooting topic.
2013-12-24 15:48:31 -08:00
Forrest Alvarez
59aeca95d4
Updated the master troubleshooting docs with an example of modifying the limits.conf.
2013-12-24 23:43:36 +00:00
Seth House
07e3cd2864
Added date to release notes for recent salt versions
...
These dates were pulled out of the Git commit for the tag (with a Vim
macro). I didn't go back before we started tagging releases with
annotated tags since that would take some mailing list archaeology. Also
there might be a couple instances where the tag came plus or minus a day
or two from the announcement.
Closes #9426
2013-12-24 16:16:25 -07:00
Forrest Alvarez
d5fbfe032b
clean up in the pkg state.
2013-12-24 22:20:44 +00:00
Joseph Hall
2240cbc0f7
Merge pull request #9427 from s0undt3ch/develop
...
Add a fake class to avoid problems when `sleekxmpp` is not available
2013-12-24 12:03:38 -08:00
Pedro Algarvio
8d90c0778d
Add a fake class to avoid problems when sleekxmpp is not available.
2013-12-24 20:00:15 +00:00
Pedro Algarvio
e7dd2ca653
Disabled the wrong Pylint code
2013-12-24 16:33:36 +00:00
Pedro Algarvio
41fe275443
Merge pull request #9423 from cachedout/pkg-doc-fix
...
Add note about refresh option to pkg state.
2013-12-24 08:29:41 -08:00
Pedro Algarvio
b439d2f85c
PyLint wrongly reports an error about calling super()
2013-12-24 16:17:20 +00:00
Pedro Algarvio
d0d5a2cb0b
Include the coding header
2013-12-24 16:13:09 +00:00
