valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
66,585 Commits 24 Branches 182 Tags 341 MiB
4302adb1fd
Commit Graph

66585 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
d6f669623c Merge pull request #31780 from gtmanfred/2015.8 
use already created vsphere connection
 2016-03-10 10:41:53 -07:00
Nicole Thomas
a067de3712 Merge pull request #31779 from sbreidba/win-dacl-highstate-output-2015.8 
win_dacl state & module: return comment field as strings, not lists.
 2016-03-10 10:41:08 -07:00
Richard McIntosh
d242cb19b4 fixing init system dectection on sles 11, refs #31617 2016-03-10 16:46:14 +01:00
Bo Maryniuk
ee1a002673 Update test case to cover SLE11 and SLE12 2016-03-10 13:26:15 +01:00
Bo Maryniuk
4b134fb2ab Add SLE11 product info snapshot, rename previous 2016-03-10 13:25:53 +01:00
Bo Maryniuk
3c5fc857b2 Bugfix: on SLE11 series base product reported as additional 2016-03-10 13:25:20 +01:00
Jorge Schrauwen
4c444d9c06 fixed issues were a value is parsed as string or number that fail the needs update check 2016-03-10 11:06:34 +00:00
Daniel Hobley
14ddae0aa8 Fixed installing keychain certificates from salt fileserver 2016-03-09 18:16:47 -06:00
Nicole Thomas
970ef0e445 Merge pull request #31744 from brejoc/fix-attribute-error-with-older-libcloud/2015.5 
Fix for AttributeError with libcloud <0.15
 2016-03-09 17:15:26 -07:00
Daniel Wallace
070eaf07f0 use already created vsphere connection 
If we have connected to this host before, just reconnect.  If the host
is different than what is in the already configured connection, make
sure we are disconnected, and connect to the new one.

Fixes #31776

There is still a memory leak in this somewhere.
 2016-03-09 16:56:18 -07:00
Skip Breidbach
aeb2bfcf46 win_dacl state & module: return comment field as strings, not lists. 2016-03-09 15:47:14 -08:00
Nicole Thomas
baeefac252 Merge pull request #31723 from sjorge/2015.8-file_ignore_regex 
file_ignore_regex is a list, not bool
 2016-03-09 16:36:10 -07:00
Nicole Thomas
5424159604 Merge pull request #31707 from sjorge/2016.3-top 
Fix incorrect default types for master_tops and file_ignore_regex
 2016-03-09 16:33:26 -07:00
Nicole Thomas
cd43cf919c Merge pull request #31747 from techhat/issue27960 
Use get_local_client with MASTER opts, not MINION
 2016-03-09 16:14:58 -07:00
Nicole Thomas
df2d23ba5d Merge pull request #31740 from terminalmage/issue31666 
Assume pillar_opts is False when not specified in masterless mode
 2016-03-09 15:57:57 -07:00
Nicole Thomas
2feee850ca Merge pull request #31725 from techhat/issue31681 
Ensure that vm_details is a dict
 2016-03-09 15:56:09 -07:00
Nicole Thomas
286ea1f61b Merge pull request #31688 from whiteinge/smtp-renderer 
Various SMTP returner fixes
 2016-03-09 15:40:37 -07:00
Nicole Thomas
1d6d982e5c Merge pull request #31752 from rallytime/bp-31686 
Back-port #31686 to 2015.8
 2016-03-09 14:23:00 -07:00
Nicole Thomas
ec90294442 Merge pull request #31733 from jacobhammons/cloud-docs 
docs to clarify cloud configuration
 2016-03-09 13:54:10 -07:00
Nicole Thomas
92ba7f3495 Merge pull request #31775 from techhat/correctmsg 
Show correct provider/driver name
 2016-03-09 13:53:10 -07:00
Joseph Hall
c1433650b4 Show correct provider/driver name 2016-03-09 13:07:22 -07:00
Nicole Thomas
249a3602eb Merge pull request #31754 from techhat/issue26498 
Check all providers, not just the current one
 2016-03-09 11:38:19 -07:00
Nicole Thomas
12c8e5a68e Merge pull request #31730 from thatch45/fix_flodir 
fix bug introduced by moving config into directory
 2016-03-09 11:37:56 -07:00
Nicole Thomas
f1c8e54135 Merge pull request #31746 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-03-09 11:37:43 -07:00
Jacob Hammons
209c641a41 Made udpates as suggested by @rallytime 2016-03-09 11:00:27 -07:00
Nicole Thomas
7ad521f7a5 Merge pull request #31735 from rallytime/fix-31639 
Add reboot, start, and stop actions to digital ocean driver
 2016-03-09 10:57:58 -07:00
Nicole Thomas
5b9c384562 Merge pull request #31753 from rallytime/bp-31694 
Back-port #31694 to 2016.3
 2016-03-09 10:57:26 -07:00
rallytime
46d29e7594 Fix daemons test logger --> log references 2016-03-09 10:51:07 -07:00
Nicole Thomas
e22f5c0a26 Merge pull request #31750 from rallytime/bp-26170 
Back-port #26170 to 2015.5
 2016-03-09 10:44:14 -07:00
Nicole Thomas
fd3610c6a4 Merge pull request #31770 from alprs/fix-influxdb_user 
Fix influxdb user functionality for version 0.9+
 2016-03-09 10:09:26 -07:00
Andreas Lutro
1349bdd2e8 fix influxdb user functionality for version 0.9+ 
- get_list_cluster_admins no longer exists
- user dict keys changed
 2016-03-09 16:01:39 +01:00
Seth House
76671b6a81 Check if we have a StringIO and grab the string instead 
This seems to be specific to Jinja so only do it if needed.
 2016-03-08 16:59:25 -07:00
Seth House
17b8cd755f Add a default for the subject 2016-03-08 16:56:54 -07:00
Joseph Hall
08c61446b7 Check all providers, not just the current one 2016-03-08 15:23:16 -07:00
Brian Jackson
47a865170e Add private_ips to list_nodes_full for vultrpy.py 
Add private_ips to list_nodes_full for vultrpy.py
 2016-03-08 13:24:50 -07:00
Imran Iqbal
e4df5d9a55 Fix typo in example for section winrepo_dir_ng 2016-03-08 13:21:52 -07:00
Nitin Madhok
3c11234a05 Make sure variable is a dictionary before popping something from it. 2016-03-08 13:15:18 -07:00
rallytime
c9aabb429e Pylint is being weird... 2016-03-08 13:11:11 -07:00
Bo Maryniuk
1882e1c960 Adjust test 2016-03-08 20:08:18 +01:00
Jochen Breuer
bb29dc2283 Added version to libcloud depends statement 
Now states ">= 0.15" instead of no version.
 2016-03-08 19:49:14 +01:00
twangboy
fc8c127a85 Fix some lint 2016-03-08 11:29:20 -07:00
twangboy
337924518f Change how enumkey works 2016-03-08 11:29:20 -07:00
twangboy
10b4e46c86 Add documentation to list_keys function 2016-03-08 11:29:20 -07:00
twangboy
7615150865 Use win_reg for registry lookups 2016-03-08 11:29:20 -07:00
Nicole Thomas
c0868307df Merge pull request #31743 from Talkless/patch-1 
Fix parentheses missmatch in documentation
 2016-03-08 11:01:23 -07:00
rallytime
f9d139cc3c Pylint Fix 2016-03-08 10:58:37 -07:00
Joseph Hall
44c100d610 Use get_local_client with MASTER opts, not MINION 2016-03-08 10:35:35 -07:00
rallytime
afdb19a307 Resolve merge conflicts in salt/cli/daemons.py 2016-03-08 10:31:21 -07:00
rallytime
838dc12b77 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/exceptions.py
  - salt/pillar/foreman.py
  - salt/returners/local_cache.py
  - salt/states/saltmod.py
  - salt/utils/__init__.py
  - salt/utils/cloud.py

The merge conflicts in salt/cli/daemons.py are still present in this commit.
@s0undt3ch is going to resolve them after this commit.
 2016-03-08 10:14:32 -07:00
Jochen Breuer
87f9534fce Added log message with update suggestion for libcloud 
Log message notifies user of old libcloud version and inability to get
projects.
 2016-03-08 17:10:06 +01:00