valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
48,065 Commits 24 Branches 182 Tags 341 MiB
5f1a93d966
Commit Graph

48065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
5f1a93d966 Merge pull request #23892 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-05-18 17:07:57 -06:00
Colton Myers
c2eed77691 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-05-18 17:07:15 -06:00
Colton Myers
17c5810c04 Merge pull request #23891 from basepi/releasenotes 
Update the release notes index page
 2015-05-18 17:06:52 -06:00
Colton Myers
dec153bcea Update the release notes index page 2015-05-18 17:06:27 -06:00
Colton Myers
a93e58f80f Merge pull request #23888 from basepi/v2014.7.6release 
Update the 2014.7.6 release notes with CVE details
 2015-05-18 16:35:51 -06:00
Colton Myers
49921b6cb2 Update the 2014.7.6 release notes with CVE details 2015-05-18 16:34:48 -06:00
Justin Findlay
66d13356b3 Merge pull request #23875 from rallytime/bp-23838 
Backport #23838 to 2015.5
 2015-05-18 16:28:55 -06:00
Nicole Thomas
d294cf260b Merge pull request #23876 from rallytime/switch_digital_ocean_tests_v2 
Switch digital ocean tests to v2 driver
 2015-05-18 16:17:13 -06:00
Nicole Thomas
b97a48c7f5 Merge pull request #23882 from garethgreenaway/23792_2015_5_wrong_return_code 
Fixes to scheduler in 2015.5
 2015-05-18 16:09:24 -06:00
Gareth J. Greenaway
37dbde6d57 Job already exists in schedule, should return False. 2015-05-18 14:06:11 -07:00
rallytime
dce9b540a6 Remove extra line 2015-05-18 14:49:27 -06: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
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
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
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
c9ed23394c Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-05-18 11:26:33 -06: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
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
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
Thomas S Hatch
3257a9bead Merge pull request #23816 from Snergster/23685-doc-fix 
Doc for #23685 Added prereq, caution, and additional mask information
 2015-05-18 09:18:03 -06:00
Jayesh Kariya
280abdec7c adding sysbench unit test case 2015-05-18 17:43:37 +05:30
Ronald van Zantvoort
9e2cf606eb Fix erroneous virtual:physical core grain detection 
DMIdecode output:

```
Handle 0x0100, DMI type 1, 27 bytes
System Information
        Manufacturer: Red Hat
        Product Name: KVM
        Version: RHEL 7.0.0 PC (i440FX + PIIX, 1996)
        Serial Number: Not Specified
        UUID: 863720D8-04A3-4046-85F4-89BA01C11728
        Wake-up Type: Power Switch
        SKU Number: Not Specified
        Family: Red Hat Enterprise Linux

Handle 0x0300, DMI type 3, 20 bytes
Chassis Information
        Manufacturer: Bochs
        Type: Other
        Lock: Not Present
        Version: Not Specified
        Serial Number: Not Specified
        Asset Tag: Not Specified
        Boot-up State: Safe
        Power Supply State: Safe
        Thermal State: Safe
        Security Status: Unknown
        OEM Information: 0x00000000
        Height: Unspecified
        Number Of Power Cords: Unspecified
```

Currently results in `virtual:physical`, which is obviously wrong.
 2015-05-18 10:35:38 +02:00
Joseph Hall
3df3b85090 Merge pull request #23832 from ahus1/ahus1_saltify_bootstrap_2015.5 
make saltify provider use standard boostrap procedure
 2015-05-17 20:18:29 -06:00
Alexander Schwartz
f5b1734782 fixing problem in unit test 2015-05-17 17:09:35 +00:00
Alexander Schwartz
cba47f6856 make saltify to use standard boostrap procedure, therefore providing all options like master_sign_pub_file 2015-05-17 18:16:43 +02:00
Joseph Hall
188f03f567 Merge pull request #23823 from gtmanfred/2014.7 
add link local for ipv6
 2015-05-17 06:48:25 -06:00
Daniel Wallace
5ef006d59d add link local for ipv6 2015-05-17 01:17:58 -05:00
Ed Kern
0fca49d52a Added prereq, caution, and additional mask information 2015-05-16 14:10:39 -07:00
Niels Abspoel
3f65631cb6 updated suse spec file to version 2015.5.0 2015-05-16 10:57:46 -06:00
Kaithar
346f30bdda Log the error generated that causes returns.mysql.returner to except. 2015-05-16 10:52:44 -06:00
Z. Liu
fb32c32065 use abspath, do not eliminating symlinks 
realpath will eliminating symlinks, so following sls won't work as expected

/root/a:
  file.directory:
    - user: root
    - group: root
    - mode: 0755
    - clean: True
    - require:
      - file: /root/a/b

/root/a/b:
  file.symlink:
    - user: root
    - group: root
    - target: /etc
 2015-05-16 10:49:58 -06:00
rallytime
0616fb7884 Fix virtualport section of virt.get_nics loop 2015-05-16 10:46:33 -06:00
Justin Findlay
f3ca682f92 Merge pull request #23802 from gtmanfred/2014.7 
if it is ipv6 ip_to_int will fail
 2015-05-15 22:06:59 -06:00
Justin Findlay
8ec4fb2a73 Merge pull request #23791 from optix2000/psutil_compat 
Psutil compat
 2015-05-15 22:05:54 -06:00
Justin Findlay
405517be8b Merge pull request #23782 from terminalmage/issue23772 
Replace "command -v" with "which" and get rid of spurious log messages
 2015-05-15 22:03:10 -06:00
Daniel Wallace
2da98b58c8 if it is ipv6 ip_to_int will fail 
fixes bug introduced in #23573
 2015-05-15 19:51:37 -05:00
Weilu Jia
5470cf58db Fix pylint errors and sloppy inline comments 2015-05-15 14:59:14 -07:00