valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
61,279 Commits 24 Branches 182 Tags 341 MiB
9e11f3aac5
Commit Graph

61279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Seth House
cb72b19240 Fix outdated Jinja 'env' variable reference 2016-03-10 19:48:42 -07:00
Nicole Thomas
7fb2331ebc Merge pull request #31800 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-03-10 13:49:53 -07:00
rallytime
44c15f0b16 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/config.py
 2016-03-10 12:56:57 -07:00
Nicole Thomas
75dfb2ed40 Merge pull request #31797 from Ch3LL/fix_pkginfo_test 
Change pkg name to less for suse pkg.info_installed test
 2016-03-10 12:08:16 -07:00
Nicole Thomas
1386b72bbf Merge pull request #31793 from xopher-mc/fix_sles_state_service_module 
fixing init system detection on sles 11, refs #31617
 2016-03-10 11:42:27 -07:00
Andreas Lutro
6a5211c8d8 don't swallow exceptions 2016-03-10 19:23:22 +01:00
Andreas Lutro
a7e9c1e381 fix db_create for influxdb 0.9+ 2016-03-10 19:23:22 +01:00
Andreas Lutro
5a8a645d4b fix create_user for new versions of influxdb 2016-03-10 19:23:22 +01:00
Ch3LL
910f0d9ffc change pkg name to less for suse 2016-03-10 11:18:44 -07:00
Nicole Thomas
2f28c166dd Merge pull request #31786 from isbm/isbm-zypper-list-products-sles11 
Bugfix: zypper doesn't detect base product on SLE11 series
 2016-03-10 11:12:46 -07:00
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
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
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
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
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
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
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
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
Nicole Thomas
c0868307df Merge pull request #31743 from Talkless/patch-1 
Fix parentheses missmatch in documentation
 2016-03-08 11:01:23 -07:00
Joseph Hall
44c100d610 Use get_local_client with MASTER opts, not MINION 2016-03-08 10:35:35 -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
Bo Maryniuk
f96c8f9b5e Keep first level away from lists. 2016-03-08 16:22:45 +01:00
Bo Maryniuk
baaed005b8 Fix PEP8 continuation 2016-03-08 16:04:24 +01:00
Bo Maryniuk
1db61ea59a Fix the always-false behavior on checking state (there are always lists at some point!) 2016-03-08 16:00:26 +01:00
Jochen Breuer
72eab406cd Fix for AttributeError with libcloud <0.15 
ex_list_projects is introduced in version 0.15 of libcloud. I'm simply
cathing the AttributeError here to return False, just like there would
be not project.

Fixes #31729
 2016-03-08 14:37:40 +01:00
Vincas Dargis
26ff46dbc6 Fix parenthesis missmatch in documentation 2016-03-08 10:18:47 +02:00
Erik Johnson
aeaf5864cd Fall back to False when pillar_opts not set 
This should have been changed when we altered the default value in
16a3938. It caused a missing pillar_opts minion config value to
incorrectly assume that master config should have been added to the
pillar data.
 2016-03-07 21:36:30 -06:00
Erik Johnson
fe19d77eb4 Add default value for pillar_opts on minion 2016-03-07 21:34:28 -06:00