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
59,340 Commits 24 Branches 182 Tags 341 MiB
3933eed307
Commit Graph

59340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
3933eed307 Merge pull request #27249 from tinyclues/login_support_more_content_type 
[Saltnado] - Add the support of login payload in JSON and YAML.
 2015-09-23 08:49:42 -06:00
Colton Myers
84eba18a93 Merge pull request #27313 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-09-22 16:11:07 -06:00
Colton Myers
ec6cd80496 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/man/salt.7
    doc/ref/auth/all/index.rst
    doc/ref/auth/all/salt.auth.rest.rst
    doc/ref/beacons/all/index.rst
    doc/ref/beacons/all/salt.beacons.ps.rst
    doc/ref/pillar/all/index.rst
    doc/ref/pillar/all/salt.pillar.consul_pillar.rst
    doc/ref/pillar/all/salt.pillar.neutron.rst
    doc/ref/pillar/all/salt.pillar.sql_base.rst
    doc/ref/pillar/all/salt.pillar.sqlite3.rst
    doc/ref/sdb/all/salt.sdb.rest.rst
    salt/modules/rh_ip.py
    salt/utils/http.py
 2015-09-22 15:31:46 -06:00
Joseph Hall
1eaa6dfa2d Merge pull request #27302 from rallytime/use_fqdn_softlayer 
Allow the use of FQDN in the SoftLayer Drivers by implementing use_fqdn flag
 2015-09-22 14:26:45 -06:00
Nicole Thomas
9a8502cb9a Merge pull request #27273 from techhat/gcereq 
Add request_instance() to gce driver
 2015-09-22 13:48:46 -06:00
Justin Findlay
c3b690273b Merge pull request #27303 from jacobhammons/ref-updates 
Updated module doc index using https://github.com/saltstack/salt/pull…
 2015-09-22 13:29:04 -06:00
Mike Place
aaa2db9943 Merge pull request #27301 from twangboy/fix_27081 
Pass ca_bundle for windows (fixes SSL Error)
 2015-09-22 13:00:44 -06:00
Jacob Hammons
7ac98a03b6 Updated module doc index using https://github.com/saltstack/salt/pull/27203 2015-09-22 11:54:34 -06:00
rallytime
11a0a528a7 Make sure the VM can be deleted if it was created with use_fqdn 2015-09-22 11:45:27 -06:00
rallytime
ba7dbc6ab0 Make sure the minion id gets set, and change softlayer_hw to work, too. 2015-09-22 11:44:50 -06:00
rallytime
9dcd11c155 Created a 'use_fqdn' flag to allow softlayer minion to use an FQDN as their minion id 2015-09-22 11:44:39 -06:00
twangboy
5c4f5f8944 Changed windows gate to check for verify_ssl option 2015-09-22 11:35:19 -06:00
Joseph Hall
d29f5c6bd1 Linting 2015-09-22 11:15:33 -06:00
Mike Place
55f4050146 Merge pull request #27300 from rallytime/bp-27287 
Back-port #27287 to 2015.8
 2015-09-22 10:59:07 -06:00
Mike Place
f63f4d8c43 Merge pull request #27289 from terminalmage/encrypted-cli-pillar 
Feature add: Encrypted CLI pillar data
 2015-09-22 10:34:13 -06:00
twangboy
e2fe5a60b5 Pass ca_bundle for windows (fixes SSL Error) 2015-09-22 10:33:28 -06:00
Mike Place
3e30daba25 Merge pull request #27298 from DSRCompany/feature/23157_module_executor 
Don't modify return results in splay.
 2015-09-22 10:27:53 -06:00
rhealitycheck
e49a6dc449 Update mongo_return.py 
same patch as for the future return. allows users to use older versions of pymongo if desired or the most recent ones.
 2015-09-22 09:35:07 -06:00
rhealitycheck
63153322b9 Update mongo_future_return.py 
Tracks the version so that it can compare pymongo versions and support older versions as well as the new versions that don't support "Connection"
 2015-09-22 09:35:07 -06:00
Dmitry Kuzmenko
d01bfed117 Don't modify return results in splay. 
Splay originally was converting return to dict and adding 'splay' key to
the return result. That breaks salt scripts.
 2015-09-22 18:02:44 +03:00
Erik Johnson
bacc76c355 Update mocked objects for state module tests 
Added the new pillar_enc value
 2015-09-22 08:25:51 -05:00
Justin Findlay
0dd68f73eb Merge pull request #27291 from khrisrichardson/remove-dup-cmd_ret 
Fixes https://github.com/saltstack/salt/pull/26355/files#r37261911
 2015-09-21 21:25:47 -06:00
Khris Richardson
b20680d3f6 fixes https://github.com/saltstack/salt/pull/26355/files#r37261911 2015-09-21 16:58:29 -07:00
Erik Johnson
60c631f89d Add documentation for GPG-encrypted CLI pillar data 2015-09-21 17:49:21 -05:00
Erik Johnson
0630b977e6 Accept new pillar_enc argument to specify decryption renderer 2015-09-21 17:48:48 -05:00
Justin Findlay
c839bb960b Merge pull request #27258 from llua/zsh-completion 
Zsh completion improvements
 2015-09-21 16:39:20 -06:00
Justin Findlay
d96462af48 Merge pull request #27288 from rallytime/do-cleanup 
Filter on 'name', not 'id', when listing images
 2015-09-21 16:37:26 -06:00
Justin Findlay
1c551c6ad6 Merge pull request #27287 from rhealitycheck/mongo-returners-patch-1 
Mongo returners patch 1
 2015-09-21 16:35:55 -06:00
rallytime
6e16fad760 Use name in all places, not id. 2015-09-21 14:36:49 -06:00
rallytime
9b34542cb0 Filter on 'name', not 'id', when listing images 
And fix doc example of what --list-images looks like
 2015-09-21 14:35:22 -06:00
rhealitycheck
8e698dfb07 Update mongo_return.py 
same patch as for the future return. allows users to use older versions of pymongo if desired or the most recent ones.
 2015-09-21 15:19:18 -05:00
rhealitycheck
2eb4744ccc Update mongo_future_return.py 
Tracks the version so that it can compare pymongo versions and support older versions as well as the new versions that don't support "Connection"
 2015-09-21 15:18:05 -05:00
Justin Findlay
9061cccc4a Merge pull request #27280 from snarfmonkey/develop 
minion log_level default is 'info' not 'warning'
 2015-09-21 13:27:32 -06:00
Justin Findlay
688f24e9e4 Merge pull request #27283 from jtand/yumpkg_yum_fix 
__grains__['osrelease'] returns a string
 2015-09-21 13:18:44 -06:00
Justin Findlay
78d44a5c74 Merge pull request #27276 from rallytime/bp-27218 
Back-port #27218 to 2015.8
 2015-09-21 13:05:54 -06:00
Justin Findlay
d5ce81e8e7 Merge pull request #27275 from rallytime/bp-27213 
Back-port #27213 to 2015.8
 2015-09-21 13:05:18 -06:00
Nicole Thomas
2be21d6451 Merge pull request #27274 from rallytime/bp-27272 
Back-port #27272 to 2015.8
 2015-09-21 12:54:48 -06:00
justinta89
b73f5289b4 __grains__['osrelease'] returns a string. Cast to int for correct comparison 2015-09-21 12:03:30 -06:00
Justin Findlay
c0943dd4d1 Merge pull request #27271 from isbm/isbm-bufix-27270 
Bugfix: crash on token authentication via API
 2015-09-21 09:53:09 -06:00
Joseph Hall
b11ce6ac2a Merge pull request #27251 from rallytime/fix-19947 
Add support for post_uri in SoftLayer cloud drivers
 2015-09-21 09:43:16 -06:00
Nasenbaer
8c0991d527 fixes #27217 clear_old_remotes clears wrong directory (gitfs) 2015-09-21 09:34:48 -06:00
macgyver13
5d4c90c479 Make get_event compatible with salt/client 2015-09-21 09:33:04 -06:00
Joseph Hall
f3ea3259a5 Make sure list_nodes_full contains a name attribute 2015-09-21 09:28:35 -06:00
Joseph Hall
35cf1f7183 Add request_instance() to gce driver 2015-09-21 09:21:57 -06:00
Nicole Thomas
2989247913 Merge pull request #27272 from techhat/ec2name 
Make sure list_nodes_full contains a name attribute
 2015-09-21 09:16:45 -06:00
Joseph Hall
fcd467d01b Make sure list_nodes_full contains a name attribute 2015-09-21 08:21:52 -06:00
Bo Maryniuk
fc524c17b9 Reduce the criteria that would match empty iterables as well as None or False values 2015-09-21 15:52:27 +02:00
Bo Maryniuk
3152af78b5 Fix the crash on token auth via API (http://git.io/vn4tx) 2015-09-21 15:48:07 +02:00
Justin Findlay
de6e5abe6c Merge pull request #27260 from bechtoldt/missing_refs 
add missing module doc references
 2015-09-20 23:48:37 -06:00
Arnold Bechtoldt
3a7d31a91c add missing module references 2015-09-20 13:22:32 +02:00