valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +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
bc84502f46 Bring salt-ssh pillar.get in line with mainline pillar.get 
Fixes #22131
 2015-05-18 15:54:07 -06:00
Jacob Hammons
ef581283fa Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5 2015-05-18 15:23:26 -06:00
Justin Findlay
91c2d51400 use append_if_not_found in locale.set_locale 2015-05-18 15:13:03 -06:00
Justin Findlay
e63260391c (re)generate /etc/default/locale 
Fixes #23767.
 2015-05-18 15:13:03 -06:00
Gareth J. Greenaway
37dbde6d57 Job already exists in schedule, should return False. 2015-05-18 14:06:11 -07:00
Gareth J. Greenaway
b207f2a433 Missing continue in the list function when deleting unused attributes. 2015-05-18 14:02:52 -07:00
rallytime
dce9b540a6 Remove extra line 2015-05-18 14:49:27 -06:00
Bastiaan Bakker
d9fa8b814e if setting client_config_dir to '~', expand path 2015-05-18 22:40:23 +02:00
Justin Findlay
50730287bb Merge pull request #23871 from rallytime/bp-23848 
Backport #23848 to 2014.7
 2015-05-18 14:34:04 -06:00
Colton Myers
31680c71e0 Merge pull request #23869 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-05-18 14:22:05 -06:00
rallytime
7ed776c293 Cloud tests should use an image that is LTS 
Changes the test image to create for digital ocean cloud tests to be on Ubuntu 14.04, not 14.10
 2015-05-18 14:04:24 -06:00
rallytime
3174227e8e Add versionadded directives to new beacon saltutil functions 2015-05-18 13:46:20 -06:00
Daniel Wallace
4a94b2c17b add refresh_beacons and sync_beacons 
This allows them to be used in the gitfs too in /srv/salt/_beacons
 2015-05-18 13:44:51 -06:00
rallytime
4acf58e758 Switch digital ocean tests to v2 driver 
This has been done on develop, but this handles the cloud test failures for 2015.5.
 2015-05-18 13:44:08 -06:00
Colton Myers
46a882eaf1 Absolute import on new win_inet_pton.py 2015-05-18 13:24:01 -06:00
dumol
379c09c3a5 Updated for SLES 12. 
Added updated instructions for latest SLES release, using the relevant repo.
 2015-05-18 13:11:42 -06:00
rallytime
f45c7bdfca Add boilerplate unit test pieces to new dockerng_test file 
Also fixes pylint errors in original PR.

Refs #23851
 2015-05-18 13:04:14 -06:00
Nicole Thomas
61c922ea1a Merge pull request #23868 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-05-18 12:35:54 -06:00
Colton Myers
6530a20340 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    pkg/suse/salt.changes
    salt/modules/lxc.py
    salt/modules/ps.py
    salt/states/cloud.py
 2015-05-18 11:39:43 -06:00
Colton Myers
c9ed23394c Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-05-18 11:26:33 -06:00
Jacob Hammons
8664e8bc8d Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5-2 2015-05-18 11:26:14 -06:00
Thomas S Hatch
46a52a6b5a Merge pull request #23803 from skizunov/develop2 
Make extensionless scripts runable in Windows
 2015-05-18 11:04:31 -06:00
Nitin Madhok
8def200db2 Fixing more sphinx errors and warnings 2015-05-18 13:03:16 -04:00
Justin Findlay
433f87372c Merge pull request #23863 from rahulhan/states_timezone_unit_test 
Adding states/timezone.py unit test
 2015-05-18 11:02:19 -06:00
Justin Findlay
37b3ee5421 Merge pull request #23862 from rahulhan/states_tomcat_unit_test 
Adding states/tomcat.py unit tests
 2015-05-18 11:02:10 -06:00
Justin Findlay
dde7207acb Merge pull request #23860 from rahulhan/states_test_unit_test 
Adding states/test.py unit tests
 2015-05-18 11:01:49 -06:00
Justin Findlay
3c9b8139e8 Merge pull request #23859 from rahulhan/states_sysrc_unit_test 
Adding states/sysrc.py unit tests
 2015-05-18 11:01:46 -06:00
Shane Lee
57c8f7c793 Merge pull request #23804 from skizunov/develop3 
Adding missing .bat scripts for salt-master and friends
 2015-05-18 10:53:55 -06:00
Nitin Madhok
dca6fb8920 Fixing more sphinx errors and warnings 2015-05-18 12:53:49 -04:00
Nicole Thomas
804c3c210e Merge pull request #23857 from rallytime/merge-23773 
Merge #23773 with pylint fix
 2015-05-18 10:42:19 -06:00
Justin Findlay
aa032ccfaf replace portage.dep.strip_empty() with list comprehension 2015-05-18 10:40:00 -06:00
Nitin Madhok
2c13cf3302 Fixing more sphinx errors and warnings 2015-05-18 12:39:49 -04:00
Stephen Spencer
3ecdd6a0c3 create_ca_signed_cert(): new args; module docs + enhanced function docs 
. Added a mention of the PyOpenSSL version for the module docstring
. Added 4 examples that reflect req + crt + cert_type + cert_filename
  bits

create_ca_signed_cert() to reflect API change for create_csr():
  new args: cert_type (str; default=None)
            type_ext: (bool; default=False)
 2015-05-18 11:38:25 -05:00
Bernd May
7576872280 Proper replacement for portage.dep.strip_empty() with list comprehension, pep8fix 2015-05-18 10:31:14 -06:00
Bernd May
2851a5cf13 Switch portage.dep.strip_empty(...) to filter(None,...) to avoid deprecation warning and do essentially the same 2015-05-18 10:31:14 -06:00
Alkivi
bb8d94f049 Added feature to handle dict in file.accumulated 2015-05-18 18:29:28 +02:00
Nitin Madhok
9dc1e0b3ae Fixing sphinx errors and warnings 2015-05-18 12:12:07 -04:00
Michael Steed
424bcc6d3a Merge pull request #23825 from makinacorpus/fixcrypto 
Fix crypto
 2015-05-18 10:11:35 -06:00
Rahul Handay
72fcabc690 Adding states/timezone.py unit test 2015-05-18 21:25:03 +05:30
Rahul Handay
65d7752d2a Adding states/tomcat.py unit tests 2015-05-18 21:22:46 +05:30
Rahul Handay
1f4cf86500 Adding states/test.py unit tests 2015-05-18 21:18:47 +05:30
Rahul Handay
6a903b054d Adding states/sysrc.py unit tests 2015-05-18 21:04:03 +05:30
Justin Findlay
4cf30a7ffa Merge pull request #23812 from rallytime/bp-23790 
Backport #23790 to 2015.5
 2015-05-18 09:30:34 -06:00
Justin Findlay
c6f939adfb Merge pull request #23811 from rallytime/bp-23786 
Backport #23786 to 2015.5
 2015-05-18 09:30:27 -06:00
Justin Findlay
aee00c83df Merge pull request #23810 from rallytime/bp-23757 
Backport #23757 to 2014.7
 2015-05-18 09:30:21 -06:00
Justin Findlay
6b3352bb1a Merge pull request #23809 from rallytime/virt_get_nics_fix 
Fix virtualport section of virt.get_nics loop
 2015-05-18 09:30:08 -06:00
Justin Findlay
ce60582de4 Merge pull request #23850 from jayeshka/sysbench-unit-test 
adding sysbench unit test case
 2015-05-18 09:28:04 -06:00
Justin Findlay
bc82999fad Merge pull request #23849 from pille/beacon-doc-fix 
beacon docs: fix YAML markup and typo
 2015-05-18 09:27:38 -06:00
Justin Findlay
bf62d43993 Merge pull request #23848 from dumol/patch-1 
Updated installation docs for SLES 12.
 2015-05-18 09:27:04 -06:00
Justin Findlay
060902fefa Merge pull request #23843 from The-Loeki/patch-1 
Fix erroneous virtual:physical core grain detection
 2015-05-18 09:24:22 -06:00