valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
64,938 Commits 24 Branches 182 Tags 341 MiB
de81a85e73
Commit Graph

64938 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
de81a85e73 Merge pull request #30668 from multani/fix/docs 
Fix salt.modules.mount documentation
 2016-01-27 10:18:43 -07:00
Nicole Thomas
9cece0e9ec Merge pull request #30665 from techhat/fixevent 
Add default for __opts__['local']
 2016-01-27 10:12:08 -07:00
Joseph Hall
b2a15ca8d4 Add default for __opts__['local'] 2016-01-27 08:04:25 -07:00
Jonathan Ballet
687a15320c Fix salt.modules.mount documentation 2016-01-27 15:57:10 +01:00
Nicole Thomas
6ce6b21990 Merge pull request #30655 from rallytime/merge-forward-develop 
[develop] Merge 2015.8 into develop
 2016-01-26 17:33:20 -07:00
rallytime
4fa80f2d5e Merge branch '2015.8' into 'develop' 
Conflicts:
  - doc/ref/states/all/index.rst
  - salt/cloud/__init__.py
  - salt/minion.py
  - salt/modules/file.py
  - salt/modules/guestfs.py
  - salt/modules/ipmi.py
  - salt/modules/osquery.py
  - salt/modules/parted.py
  - salt/modules/seed.py
  - salt/modules/virt.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/states/boto_elb.py
  - salt/states/pkg.py
 2016-01-26 16:19:39 -07:00
Nicole Thomas
d6e2c7aa82 Merge pull request #30614 from techhat/depimg 
WIP: Deprecate salt/modules/img.py
 2016-01-26 15:03:11 -07:00
Nicole Thomas
30e03a8b0c Merge pull request #30644 from tbaker57/another_go_at_30573 
Another go at fixing 30573
 2016-01-26 13:18:41 -07:00
root
267b8827fd Another go at fixing 30573 2016-01-26 13:40:15 -05:00
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
Nicole Thomas
afa334c192 Merge pull request #30636 from arthurlogilab/patch-16 
docstring typo
 2016-01-26 10:13:23 -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
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
Jorge Schrauwen
3000db55bd fixed catching the wrong except 2016-01-26 06:58:38 +00: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
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
Hamza Sheikh
bb599a61a2 Fix indent in setup.py 2016-01-25 15:37:06 -08:00
Jorge Schrauwen
1f80df6465 removed versionchanged as no backwards compat stuff happened 2016-01-25 23:24:39 +00: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
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
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
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
C. R. Oldham
f5fd38624e Remove bad symlinks in osx pkg dirs 2016-01-25 14:29:51 -07:00
Joseph Hall
dcf64c8113 Fixed positional params 2016-01-25 12:58:00 -07:00
Jorge Schrauwen
4ec64e9668 fix typo 2016-01-25 19:56:59 +00:00
Jorge Schrauwen
ead9fce6b1 expect the new exception that can be thrown and handle it 2016-01-25 19:41:57 +00:00
Joseph Hall
4e6e47d67a Allow alternate root 2016-01-25 12:40:22 -07:00
rallytime
57b7e6cc93 Add glance state to list of state modules 
Fixes #30621
 2016-01-25 12:35:19 -07:00
Nicole Thomas
a48ffaa84e Merge pull request #30590 from mlalpho/salt-utils-cloud-updates 
salt-utils-cloud updates
 2016-01-25 12:30:43 -07:00
Nicole Thomas
653292ec88 Merge pull request #30555 from twangboy/mac_brew 
renamed brew.py to mac_brew.py
 2016-01-25 12:30:31 -07:00
Jorge Schrauwen
4d2fa2e2aa switch unit test to except CommandExecutionError 2016-01-25 19:30:09 +00:00