Mike Place
42f02890c7
Merge pull request #27853 from garethgreenaway/adding_return_kwargs
...
Adding return_kwargs
2015-10-12 08:51:51 -06:00
Gareth J. Greenaway
77a293823f
Adding the ability from both the Salt CLI and in the Salt schedule to pass a new argument, return_kwargs. Using this option will override any returner options already set in the minion configuration or inside an alternative configuration.
2015-10-10 18:00:42 -07:00
Nicole Thomas
93fba07362
Merge pull request #27840 from lyft/boto_module_fixes
...
Various followup fixes for boto modules
2015-10-09 22:41:07 -06:00
Ryan Lane
07cd3a0ad4
CLI example
2015-10-09 15:05:57 -07:00
Ryan Lane
81028e86ad
Various followup fixes for boto modules
2015-10-09 14:25:00 -07:00
Nicole Thomas
c45f989699
Merge pull request #27778 from jbouse/develop
...
Fix HipChat v2 API returner
2015-10-08 17:44:19 -06:00
Nicole Thomas
d59532c191
Merge pull request #27806 from blast-hardcheese/bugfix/file.managed-26538
...
Empty string is falsy
2015-10-08 17:14:42 -06:00
Nicole Thomas
dc62a15c3e
Merge pull request #27810 from techhat/optspmdeps
...
Add optional and recommended deps to SPM
2015-10-08 17:12:08 -06:00
Joseph Hall
222bca1338
Add optional and recommended deps to SPM
2015-10-08 15:31:26 -06:00
Nicole Thomas
8846f10d72
Merge pull request #27762 from lyft/add-missing-attributes-boto-asg
...
Add missing code block from attributes support in boto_asg get_instances
2015-10-08 15:13:56 -06:00
Ryan Lane
a8198c2f9f
Add missing code block from attributes support in boto_asg get_instances
2015-10-08 13:35:36 -07:00
Devon Stewart
7e977e38b7
Empty string is falsy
2015-10-08 12:42:34 -07:00
Nicole Thomas
5a44eb93f5
Merge pull request #27782 from garethgreenaway/returner_profile_documention
...
Returner Documention Fixes
2015-10-08 09:18:27 -06:00
Gareth J. Greenaway
6a05e7bea4
Fixing the documentation for the returners that mention using profiles, items in the profile need to include the virtualname of the returner to be found.
2015-10-07 21:14:07 -07:00
Jeremy T. Bouse
391f1c6971
Fix HipChat v2 API returner
...
Add 'Content-Type' to v2 POST headers to comply with API documentation and remove Bad Request error noted in Issue #27777
2015-10-07 22:51:33 -04:00
Nicole Thomas
0ab0aa4d79
Merge pull request #27771 from srkunze/venv_docs
...
[VIRTUALENV_MOD] added docs strings to explain parameters
2015-10-07 16:05:17 -06:00
Nicole Thomas
fafc6ce09f
Merge pull request #27728 from tkwilliams/d.boto_vpc.dhcp_options_stuff
...
Enablement for using states to manage AWS EC2 instances
2015-10-07 15:41:38 -06:00
Tom Williams
19f6a7e85e
Merge branch 'develop' into d.boto_vpc.dhcp_options_stuff
...
Conflicts:
salt/modules/boto_secgroup.py
salt/states/boto_secgroup.py
2015-10-07 17:01:35 -04:00
Colton Myers
57f30cc04e
Merge pull request #27764 from basepi/merge-forward-develop
...
Merge forward from 2015.8 to develop
2015-10-07 14:40:10 -06:00
Sven R. Kunze
8714e7e2bf
added docs strings to explain parameters
2015-10-07 22:28:54 +02:00
Tom Williams
78e91fc7b9
Parameter defs for new functions per @ryan-lane's suggestion.
2015-10-07 16:26:27 -04:00
Colton Myers
88039b70b2
Fix lint
2015-10-07 13:46:56 -06:00
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
Tom Williams
cac31903bf
...and a couple more versionadded tags.
2015-10-07 12:34:47 -04:00
Tom Williams
f24c8574a4
Missed a ".. versionadded:: Boron" tag in salt/modules/boto_vpc.py
2015-10-07 12:28:38 -04: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
Tom Williams
c19c22e98f
...and one last PEPification
2015-10-07 01:54:12 -04:00
Tom Williams
06b2284258
Argh! One. Final. Bug. I hope...
2015-10-07 01:46:09 -04:00
Tom Williams
12a7be8176
And then fix the bits I broke fixing the OTHER stuff...
2015-10-07 01:25:35 -04:00
Tom Williams
a9fa06c171
- Add test=True cases for new functions
...
- Add pass-through args for modified functions
- Describe limitations of current dhcp_options code
- versionadded:: Boron tags for new funcs
- Some formatting cleanup
2015-10-07 00:45:57 -04: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
