Commit Graph

65110 Commits

Author SHA1 Message Date
Nicole Thomas
e2f9158974 Merge pull request #30641 from sjorge/module-solarisips
only load solarisips IF we actually have the pkg binary
2016-01-26 11:13:41 -07:00
Nicole Thomas
cb84ef0a00 Merge pull request #30633 from sjorge/state-locale
fixed catching the wrong except
2016-01-26 11:05:45 -07:00
Nicole Thomas
96e121710b Merge pull request #30606 from eyj/pr-none-tags
EC2: Allow tags with value None
2016-01-26 11:03:55 -07:00
Joseph Hall
29df2124a2 Remove tests for img.py since we're deprecating it 2016-01-26 11:00:38 -07:00
Colton Myers
7cad3e8d8d Merge pull request #30630 from hamzasheikh/fixes-for-python3.5
Fix indent in setup.py
2016-01-26 10:59:58 -07:00
twangboy
c70e182cdf Fixed indenting... got messed up somehow... 2016-01-26 10:38:11 -07:00
Nicole Thomas
afa334c192 Merge pull request #30636 from arthurlogilab/patch-16
docstring typo
2016-01-26 10:13:23 -07:00
twangboy
246f75f2dd Renamed variables, updated docs, added tag 2016-01-26 10:10:22 -07:00
Colton Myers
7d307e2a04 Merge pull request #30611 from isbm/isbm-zypper-latest
Bugfix: Zypper `pkg.latest` crash fix
2016-01-26 09:35:47 -07:00
Colton Myers
5bc11d7539 Merge pull request #30631 from rallytime/fix-7811
Refactor rabbitmq_cluster states to use test=true functionality correctly
2016-01-26 09:23:49 -07:00
Jorge Schrauwen
39bdaea5e3 only load solarisips IF we actually have the pkg binary 2016-01-26 16:00:43 +00:00
Jake Davis
4cbf49d487 Rename 'pillar_cache' as 'minion_pillar_cache.' 2016-01-26 10:14:35 -05:00
Arthur Lutz
6761ea5008 docstring typo 2016-01-26 11:13:56 +01:00
Bo Maryniuk
a7141be651 Put 'kwargs' on its own line according to the common pattern 2016-01-26 10:03:02 +01:00
Daniel Wendler
e38f1fba3f Renaming salt-ssh option and documentation fix
For consistency the wipe_ssh option is renamed in ssh_wipe as all other
options in the salt-ssh command are in this style.
The documentation was also adjusted to reflect the renaming.
There were also an wrong salt-ssh example in the documentation.
2016-01-26 08:36:13 +01:00
Jorge Schrauwen
3000db55bd fixed catching the wrong except 2016-01-26 06:58:38 +00:00
jizhilong
5c710fb709 fix pylint errors and add a docstring. 2016-01-26 14:54:15 +08:00
twangboy
a4534ee94c Fixed documentation 2016-01-25 18:24:22 -07:00
twangboy
54b50236a6 Fixed another error 2016-01-25 18:23:28 -07:00
twangboy
76a0cf33e5 Fixed syntax error 2016-01-25 18:22:55 -07:00
twangboy
bc4e07846d Added/Updated documentation 2016-01-25 17:59:37 -07:00
Colton Myers
621d8785de Merge pull request #30579 from sjorge/module-localemod
Fix up salt.modules.locale(mod) for Solaris and some generic improvements
2016-01-25 17:21:42 -07:00
Colton Myers
ef6c4e8377 Merge pull request #30628 from rallytime/fix-25658
Refactor rabbitmq_policy states to use test=true functionality correctly
2016-01-25 17:21:03 -07:00
twangboy
729caed9f2 Updated docs 2016-01-25 17:20:54 -07:00
twangboy
88db102dd0 Fixed set_boot_arch, added some docs 2016-01-25 17:16:25 -07:00
Colton Myers
64f17568a4 Merge pull request #30627 from sjmh/etcd_set_tree
Add etcd update function
2016-01-25 17:07:46 -07:00
Colton Myers
80d0e428aa Merge pull request #30624 from cro/remove_bad_symlinks
Remove bad symlinks from osx pkg dir
2016-01-25 17:02:25 -07:00
Colton Myers
330ea9a292 Merge pull request #30622 from rallytime/fix-30621
Add glance state to list of state modules
2016-01-25 16:55:54 -07:00
Colton Myers
f00d8f398a Merge pull request #30618 from rallytime/bp-30591
Back-port #30591 to 2015.8
2016-01-25 16:55:20 -07:00
rallytime
bf9ffded6d Refactor rabbitmq_cluster states to use test=true functionality correctly
Fixes #7811
2016-01-25 16:47:54 -07:00
twangboy
a77da9540c Fixed quoting for set_subnet_name 2016-01-25 16:37:26 -07:00
Hamza Sheikh
bb599a61a2 Fix indent in setup.py 2016-01-25 15:37:06 -08:00
twangboy
d35fa47fa0 Added command line example for set_computer_name 2016-01-25 16:33:37 -07:00
Jorge Schrauwen
1f80df6465 removed versionchanged as no backwards compat stuff happened 2016-01-25 23:24:39 +00:00
Colton Myers
643c9c9616 Merge pull request #30586 from abednarik/fix_comment_line_perms
Fix comment_line permissions.
2016-01-25 16:24:01 -07:00
Nicole Thomas
bac21c21d5 Merge pull request #30594 from mlalpho/salt-boto_secgroup-updates
salt-boto_secgroup updates
2016-01-25 16:23:41 -07:00
twangboy
a5ddc6eee0 Quoted computer name 2016-01-25 16:22:21 -07:00
Nicole Thomas
f364fbfe64 Merge pull request #30603 from michalsuba/patch-1
addressing #29265
2016-01-25 16:21:49 -07:00
Colton Myers
94bf7790cf Merge pull request #30567 from rallytime/fix-25363
Make sure rabbitmq_vhost states are using test=true properly.
2016-01-25 16:19:45 -07:00
twangboy
2ffc3168de Added force option to set_remote_login 2016-01-25 16:19:05 -07:00
twangboy
6d9c5c7aed Fixed sytax errors 2016-01-25 16:13:15 -07:00
Colton Myers
818ff2af78 Merge pull request #30381 from quantonganh/launchctl-yosemite
Launchctl yosemite
2016-01-25 16:08:25 -07:00
Nicole Thomas
ddc8be6c6d Merge pull request #30620 from sjorge/state-archive
Fix salt.states.archive __virtual__
2016-01-25 16:06:51 -07:00
Nicole Thomas
6b940d9655 Merge pull request #30625 from jfindlay/eauth_acl
doc.topics.eauth: clarify client_acl vs eauth
2016-01-25 16:03:24 -07:00
twangboy
56dc75cd94 Additional functions 2016-01-25 16:01:57 -07:00
Nicole Thomas
408d86664e Merge pull request #30626 from junster1/get_enablefix
fix get_enabled to return currently enable services
2016-01-25 15:59:30 -07:00
rallytime
1e8e86007c Refactor rabbitmq_policy states to use test=true functionality correctly
Fixes #25658
2016-01-25 15:21:19 -07:00
Steve Hajducko
a015473d4e Add etcd update function
Adds a update function that takes a dict and sets multiple etcd keys.
2016-01-25 14:13:33 -08:00
Ryan Larson
97d78e1009 fix get_enabled to return currently enable services 2016-01-25 15:37:06 -06:00
Justin Findlay
b5e2cff028 doc.topics.eauth: clarify client_acl vs eauth
Fixes #30587.
2016-01-25 14:32:34 -07:00