valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
53,502 Commits 24 Branches 182 Tags 341 MiB
9dbafcc051
Commit Graph

53502 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
9dbafcc051 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/digital_ocean_v2.py
    salt/modules/tls.py
 2015-05-20 11:59:59 -06:00
Justin Findlay
b06df57e03 Merge pull request #23970 from jayeshka/system-unit-test 
adding system unit test case
 2015-05-20 11:12:57 -06:00
Justin Findlay
38d5f75756 Merge pull request #23967 from jayeshka/memcached-states-unit-test 
adding states/memcached unit test case
 2015-05-20 11:12:26 -06:00
Justin Findlay
868e807d8a Merge pull request #23966 from jayeshka/modjk-states-unit-test 
adding states/modjk unit test case
 2015-05-20 11:11:48 -06:00
Thomas S Hatch
63164900bd Merge pull request #23942 from jacobhammons/2015.5 
Updates to sphinx saltstack2 doc theme
 2015-05-20 09:43:54 -06:00
Thomas S Hatch
9fc0b22895 Merge pull request #23964 from quantonganh/tls-get-extensions 
Tls get extensions
 2015-05-20 09:40:20 -06:00
Thomas S Hatch
afa1971747 Merge pull request #23972 from alkivi-sas/targeting-dict-keys 
Improved matching on dict keys
 2015-05-20 09:38:54 -06:00
Thomas S Hatch
03c993610c Merge pull request #23968 from s0undt3ch/develop 
`salt.utils.http` fixes
 2015-05-20 09:36:00 -06:00
Nicole Thomas
ede34f2b95 Merge pull request #23974 from drawsmcgraw/update-include-docs 
Quick note on usability of 'include' statement.
 2015-05-20 09:25:39 -06:00
Nicole Thomas
479e24b189 Merge pull request #23962 from jarpy/fixed-pitch-slack 
Fixed-pitch messages from Slack returner.
 2015-05-20 09:21:22 -06:00
Drew Malone
fb0f1080dd Quick note on usability of 'include' statement. 2015-05-20 10:46:03 -04:00
Colton Myers
c641c0c964 Merge pull request #23897 from makinacorpus/lxc_seed_and_prof_ports 
Lxc seed and prof ports
 2015-05-20 07:12:27 -06:00
Alkivi
cdf0999394 Improved matching on dict keys 
Pillar example:
firewall:
  mysql:
    - front01.test
  mysql2:
    dport: 3306
    proto: tcp
    family: ipv4
    host:
      - front01.test
      - front02.test

You can now do :

salt -I 'firewall:*:front01.test' test.ping
salt -I 'firewall:*:host:front01.test' test.ping
 2015-05-20 14:44:28 +02:00
Pedro Algarvio
3d6a410d57 Fix wrong variable assignment 2015-05-20 11:42:54 +01:00
Jayesh Kariya
89eb00815e adding system unit test case 2015-05-20 16:06:10 +05:30
Pedro Algarvio
9f821e9e06 Don't try to set cookies if we don't have a instantiated cookie jar 2015-05-20 11:25:02 +01:00
Pedro Algarvio
d4eb9fc9c5 Default missing items as an empty string. 
Since the cookie lib concatenates them, `'a' + 'b'` ....
 2015-05-20 11:20:59 +01:00
Pedro Algarvio
4d37601dd5 Have cookie JAR's respect the configured cachedir 
And only when missing default to `syspaths.CACHE_DIR`
 2015-05-20 11:18:39 +01:00
Jayesh Kariya
422a96497d adding states/modjk unit test case 2015-05-20 15:31:46 +05:30
Jayesh Kariya
8ef9240e25 adding states/memcached unit test case 2015-05-20 15:30:45 +05:30
Mathieu Le Marec - Pasquet
d1d6cef142 lxc: reconcile with forward merge 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-20 09:47:18 +02:00
Quan Tong Anh
cdc3980345 tls module: PEP 8 2015-05-20 14:34:54 +07:00
Quan Tong Anh
060e59f4e0 tls module: default CA filename should be only used when it is not None 2015-05-20 14:09:49 +07:00
Quan Tong Anh
adb4e5ecff tls module: handle the case when the pillar for extensions is not defined 2015-05-20 14:08:11 +07:00
Quan Tong Anh
7785e0b37d tls module: missing cacert_path when calling maybe_fix_ssl_version 2015-05-20 14:06:29 +07:00
Toby McLaughlin
c2cb013296 Fixed-pitch messages from Slack returner. 
Wrap messages from the Slack returner in triple backticks to format them
as a block of pre-formatted, fixed-width text.
 2015-05-20 16:58:38 +10:00
Nicole Thomas
587957badc Merge pull request #23874 from joejulian/2015.5_tls_validate_kwargs 
Validate keyword arguments to be valid
 2015-05-19 22:53:40 -06:00
Justin Findlay
97b3f0b114 Merge pull request #23959 from gladiatr72/tls_exec_module__create_csr__cert_type_propigation_fix 
Oops. Neglected to replace the string, 'server', with cert_type when
 2015-05-19 22:37:45 -06:00
Justin Findlay
00c5c22867 Merge pull request #23960 from rallytime/bp-22114 
Backport #22114 to 2015.5
 2015-05-19 22:37:09 -06:00
Justin Findlay
4648b46e05 Merge pull request #23961 from rallytime/bp-23944 
Backport #23944 to 2015.5
 2015-05-19 22:35:41 -06:00
Nicole Thomas
0cb5cd3938 Merge pull request #23948 from jfindlay/augeas_changes 
augeas.change state now returns changes as a dict
 2015-05-19 22:00:10 -06:00
Ryan Lane
970d19a31e Add missing loginclass argument to _changes call 2015-05-19 21:54:12 -06:00
Damian Myerscough
f3e1d63fce Catch KeyError 2015-05-19 21:47:39 -06:00
Damian Myerscough
306b1ea6b8 Fixing KeyError 2015-05-19 21:47:39 -06:00
Damian Myerscough
6b2cda2861 Fix PEP8 complaint 2015-05-19 21:47:39 -06:00
Damian Myerscough
239e50f30d Fixing KeyError when there are no additional pages 2015-05-19 21:47:39 -06:00
Stephen Spencer
8f00d72584 Oops. Neglected to replace the string, 'server', with cert_type when 
those bits were added in.  Eagle eye award to @quantonganh
 2015-05-19 22:43:49 -05:00
Justin Findlay
9f196e1ec8 Merge pull request #23954 from nmadhok/vmware-patch-1 
Fixing ImportError in salt 2014.7.0 version causing VMware salt-cloud driver to fail
 2015-05-19 21:27:23 -06:00
Justin Findlay
237542b69c Merge pull request #23938 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-05-19 21:12:15 -06:00
Justin Findlay
e23a4b2a84 Merge pull request #23944 from lyft/fix-user-present 
Add missing loginclass argument to _changes call
 2015-05-19 21:11:30 -06:00
Justin Findlay
f09b80a8b5 augeas.change state now returns changes as a dict 2015-05-19 21:10:11 -06:00
Justin Findlay
2d185f78f7 Merge pull request #23957 from rallytime/bp-23951 
Backport #23951 to 2015.5
 2015-05-19 21:04:24 -06:00
Justin Findlay
ebff1ff967 Merge pull request #23956 from rallytime/bp-23906 
Backport #23906 to 2015.5
 2015-05-19 21:04:14 -06:00
Justin Findlay
da3f9197d3 Merge pull request #23955 from rallytime/bp-19305 
Backport #19305 to 2015.5
 2015-05-19 21:03:55 -06:00
Ryan Lane
996b431252 Update file.py 2015-05-19 19:48:26 -06:00
Ryan Lane
85d461f748 Do not check perms in file.copy if preserve 2015-05-19 19:48:26 -06:00
Nicole Thomas
92cdfec637 Merge pull request #23951 from lyft/file-copy-preserve-fix 
Do not check perms in file.copy if preserve
 2015-05-19 19:47:40 -06:00
Nicole Thomas
8927b91be1 Merge pull request #23934 from techhat/sessioncookie 
Set cookie domain to string if None
 2015-05-19 19:41:41 -06:00
Stephen Spencer
9d87fd335c add proper marker for format argument 2015-05-19 19:31:47 -06:00
Stephen Spencer
197688ef0c Added exception handler to trap the RuntimeError raised when 
Depends.enforce_dependency() class method fires unsuccessfully. There appears
to be no synchronization within the Depends decorator class wrt the
class global dependency_dict which results in incomplete population of any
loader instantiation occuring at the time of one of these exceptions.

This would mitigate the immediate affects of #23839 and #23373.
 2015-05-19 19:31:47 -06:00