Colton Myers
|
9128e8e7ae
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
salt/cloud/clouds/gce.py
salt/modules/daemontools.py
|
2015-10-07 13:14:28 -06:00 |
|
Colton Myers
|
69d960f8e6
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
doc/man/salt.7
doc/topics/ssh/index.rst
salt/modules/boto_secgroup.py
salt/modules/dockerng.py
salt/states/archive.py
salt/states/boto_elb.py
salt/states/boto_secgroup.py
tests/unit/modules/schedule_test.py
|
2015-10-07 13:11:48 -06:00 |
|
Colton Myers
|
82a51cebde
|
Merge pull request #27760 from basepi/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
|
2015-10-07 13:11:17 -06:00 |
|
Colton Myers
|
35425b14ad
|
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
doc/man/salt-api.1
doc/man/salt-call.1
doc/man/salt-cloud.1
doc/man/salt-cp.1
doc/man/salt-key.1
doc/man/salt-master.1
doc/man/salt-minion.1
doc/man/salt-run.1
doc/man/salt-ssh.1
doc/man/salt-syndic.1
doc/man/salt-unity.1
doc/man/salt.1
doc/man/salt.7
salt/modules/pip.py
salt/states/user.py
|
2015-10-07 12:06:12 -06:00 |
|
Colton Myers
|
b2937b6a16
|
Merge pull request #27759 from basepi/merge-forward-2015.5
[2015.5] Merge forward from 2014.7 to 2015.5
|
2015-10-07 12:01:54 -06:00 |
|
Colton Myers
|
792ee084bb
|
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
|
2015-10-07 12:00:53 -06:00 |
|
Justin Findlay
|
aced4229cb
|
Merge pull request #27757 from jfindlay/virtret
fix virtual fcn return doc indentation
|
2015-10-07 11:50:18 -06:00 |
|
Justin Findlay
|
03400ef45b
|
fix virtual fcn return doc indentation
Fixes #27724.
|
2015-10-07 11:49:16 -06:00 |
|
Justin Findlay
|
4b9128b491
|
Merge pull request #27732 from jacobhammons/26673
update docs for __virtual__ and __virtualname__
|
2015-10-07 11:29:31 -06:00 |
|
Nicole Thomas
|
a130896d1c
|
Merge pull request #27747 from Sacro/fix-chocolatey-version
Chocolatey doesn't have a help command.
|
2015-10-07 10:06:53 -06:00 |
|
Nicole Thomas
|
57b5b594bd
|
Merge pull request #27754 from rallytime/fix-27636
Change test.nop version directive to 2015.8.1
|
2015-10-07 09:59:55 -06:00 |
|
rallytime
|
31b9852d9a
|
Change test.nop version directive to 2015.8.1
Fixes #27636
|
2015-10-07 09:57:01 -06:00 |
|
Jacob Hammons
|
75cc07cf10
|
noted that __virtual__ can return False and an error string
|
2015-10-07 09:48:46 -06:00 |
|
Justin Findlay
|
421f5eb5e8
|
Merge pull request #27739 from eliasp/auth.yubico-typo
Fix typo (Authentcate → Authenticate)
|
2015-10-07 09:33:21 -06:00 |
|
Joseph Hall
|
c113af9b08
|
Merge pull request #27708 from rallytime/cloud-combine-ifs
Collapse if statements in salt.utils.cloud.py for simplicity
|
2015-10-07 09:31:01 -06:00 |
|
rallytime
|
0b4eff77ec
|
Split up comment lines
|
2015-10-07 09:28:20 -06:00 |
|
Joseph Hall
|
305be1ff75
|
Merge pull request #27701 from rallytime/linode-combine-ifs
Clean up linode if statements to be more clear
|
2015-10-07 09:23:19 -06:00 |
|
Ben Woodward
|
8f1fa9e78e
|
Chocolatey doesn't have a help command.
|
2015-10-07 13:44:51 +01:00 |
|
Elias Probst
|
05202c6b26
|
Fix typo (Authentcate → Authenticate)
|
2015-10-07 10:08:32 +02:00 |
|
jacobhammons
|
f7787f4a2c
|
Merge pull request #27736 from jacobhammons/theme-updates2
Updated saltstack2 theme to add SaltConf16 banner
|
2015-10-06 19:44:06 -06:00 |
|
jacobhammons
|
4e48651de0
|
Merge pull request #27733 from jacobhammons/bug-fixes
hardening topic - updates to docs.saltstack.com theme
|
2015-10-06 19:44:00 -06:00 |
|
jacobhammons
|
9a0171089d
|
Merge pull request #27734 from jacobhammons/theme-updates
Updated saltstack2 theme to add SaltConf16 banner
|
2015-10-06 19:43:53 -06:00 |
|
Jacob Hammons
|
234a699e41
|
Updated saltstack2 theme to add SaltConf16 banner
|
2015-10-06 17:51:30 -06:00 |
|
Jacob Hammons
|
3a52d3606b
|
Updated saltstack2 theme to add SaltConf16 banner
|
2015-10-06 17:42:53 -06:00 |
|
Jacob Hammons
|
cbecd4f553
|
Updated saltstack2 theme to add SaltConf16 banner
|
2015-10-06 17:38:49 -06:00 |
|
Jacob Hammons
|
117e0c2bcc
|
Added hardening topic based on the information in Refs #27088
|
2015-10-06 17:36:54 -06:00 |
|
Jacob Hammons
|
b928e1afa8
|
update docs for __virtual__ and __virtualname__
Refs #26673
|
2015-10-06 17:23:42 -06:00 |
|
Nicole Thomas
|
d3f2dfe835
|
Merge pull request #27727 from rallytime/merge-27719
Merge #27719 w/pylint fix
|
2015-10-06 15:13:37 -06:00 |
|
rallytime
|
a7fd156162
|
Pylint
|
2015-10-06 15:12:27 -06:00 |
|
Nicole Thomas
|
ad8fd0a5c7
|
Merge pull request #27722 from Aoreias/develop
Sorted compare for alarm actions
|
2015-10-06 15:08:24 -06:00 |
|
Nicole Thomas
|
f26bcd2d21
|
Merge pull request #27724 from jfindlay/virtret
update __virtual__ return documentation
|
2015-10-06 15:06:46 -06:00 |
|
Colton Myers
|
d67e8c5c2c
|
Merge pull request #27725 from basepi/states.cross.call.27481
Fix global injection for state cross calls
|
2015-10-06 15:02:14 -06:00 |
|
Colton Myers
|
e12269d871
|
Remove unused import
|
2015-10-06 14:10:55 -06:00 |
|
Justin Findlay
|
6bddf80546
|
update __virtual__ return documentation
Related to #26755; fixes #27116; implements part of #27643.
|
2015-10-06 13:47:31 -06:00 |
|
Colton Myers
|
4e6505b2e7
|
Return the wrapper (whoops)
|
2015-10-06 13:44:55 -06:00 |
|
Aoreias
|
09f5a56bb7
|
Sorted compare for alarm actions
Fix for boto_cloudwatch sometimes incorrectly returning a state change when a state is set with multiple alarm actions.
|
2015-10-06 14:59:36 -04:00 |
|
Justin Findlay
|
6bf2ee2751
|
tell user when x509 exec/state module can't load
Fixes #27595.
|
2015-10-06 12:46:35 -06:00 |
|
Nicole Thomas
|
1b9e814c13
|
Merge pull request #27718 from rallytime/merge-27635-and-27552
Merge #27635 and #27552
|
2015-10-06 12:40:24 -06:00 |
|
rallytime
|
b3201bce19
|
Change listeners to arg instead of kwarg
|
2015-10-06 11:56:51 -06:00 |
|
rallytime
|
249f02c2bb
|
Protect against TypeError is listeners is None
|
2015-10-06 11:54:16 -06:00 |
|
rallytime
|
8ab7230535
|
Example formatting and versionadded directives
|
2015-10-06 11:54:03 -06:00 |
|
Ethan Moore
|
ba6d6c8911
|
Merge branch 'elb-listener-policy-mangement' of https://github.com/woodrow/salt into boto_elb_updates2
Conflicts:
salt/states/boto_elb.py
|
2015-10-06 17:11:33 +00:00 |
|
Ethan Moore
|
3316959866
|
Merging tag and cname modifications
|
2015-10-06 17:01:33 +00:00 |
|
Erik Johnson
|
06e67d25f8
|
Merge pull request #27628 from ticosax/dockerng-container-label
[dockerng] Add support of `labels` parameter for dockerng
|
2015-10-06 08:58:40 -05:00 |
|
Nicolas Delaby
|
edf625c8b4
|
Add support of labels parameter for dockerng
|
2015-10-06 13:18:05 +02:00 |
|
Stephen Woodrow
|
3f7e38951a
|
Add one last docstring.
|
2015-10-06 01:24:38 -07:00 |
|
Stephen Woodrow
|
a223f348e9
|
Style fixes.
|
2015-10-06 01:12:14 -07:00 |
|
Stephen Woodrow
|
f50991c417
|
Add docstrings.
|
2015-10-05 23:41:16 -07:00 |
|
Stephen Woodrow
|
87584d1f1a
|
Rename helper function.
|
2015-10-05 23:41:08 -07:00 |
|
rallytime
|
ed315cc206
|
Collapse if statements in salt.utils.cloud.py for simplicity
|
2015-10-06 00:03:04 -06:00 |
|