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
67,763 Commits 24 Branches 182 Tags 341 MiB
9a94019aad
Commit Graph

67763 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
0ef623f6fa Merge pull request #31908 from Ashald/feature/state-orchestrate-pillarenv 
Allow passing pillarenv into state.orchestrate
 2016-03-15 16:18:20 -06:00
Mike Place
1b65b48ac3 Merge pull request #31877 from alprs/fix-salt_ssh_log 
Set option.explicit when passing from Saltfile
 2016-03-15 16:16:26 -06:00
Mike Place
bbd00db445 Merge pull request #31909 from saravanakumar-periyasamy/develop 
#31899: Added the identifier parameter to get_records, update_records…
 2016-03-15 16:07:35 -06:00
rallytime
f8b4b1b211 last pylint! 2016-03-15 16:06:54 -06:00
rallytime
892591a39c More pylint fixes 2016-03-15 15:50:05 -06:00
Mike Place
62e43a6a77 Merge pull request #31847 from sakateka/multimaster_with_type_func 
Add ability to multimaster mode with master_type = func
 2016-03-15 15:40:58 -06:00
Perry Zipoy
6656f78bbd Clean non-applicable SMBIOS info for serial, part, and version matches 
When cleaning out well-known bogus values from a DMI contents, this
change adds a filter for values containing the string "applicable" for
the serial number (as well as "part" and "version" matches). For
example, if "Not Applicable" is returned from SMBIOS for the serial
number (DMI string "system-serial-number"), this change will not allow
the string "Not Applicable" from being saved as the grain value.

Signed-off-by: Perry Zipoy <perry.zipoy@ni.com>
 2016-03-15 16:12:14 -05:00
rallytime
35b2076584 Pylint fixes 2016-03-15 14:55:35 -06:00
Mike Place
ef1c9863f3 Merge pull request #31777 from jettero/develop 
reliably detect duplicate keys during batch (or at least not crash)
 2016-03-15 14:36:32 -06:00
Nicole Thomas
d05c3eeba9 Merge pull request #31911 from rallytime/merge-31903-with-pylint 
Merge #31903 with pylint fix
 2016-03-15 14:35:35 -06:00
Mike Place
819a4a8b54 Merge pull request #31883 from mvpstars/scaleway-x86 
Fix scaleway cloud provider and manage x86 servers
 2016-03-15 14:31:18 -06:00
rallytime
85e5acd11a Merge #31903 with pylint fix 
Merges #31903
 2016-03-15 14:05:09 -06:00
Mike Place
142c47c50d Merge pull request #31903 from terminalmage/fix-git-pillar 
Use remote_ref instead of local_ref to see if checkout is necessary
 2016-03-15 14:04:56 -06:00
Mike Place
ffd65c36e5 Merge pull request #31845 from sakateka/check_file_meta_clean_tmp 
Now a check_file_meta deletes temporary files when test=True
 2016-03-15 13:55:21 -06:00
Mike Place
30241f53bc Merge pull request #31910 from cachedout/doc_31832 
Docs for stand-alone minion
 2016-03-15 13:53:31 -06:00
Mike Place
1c2e8e0828 Docs for stand-alone minion 
Refs #31832
 2016-03-15 13:52:09 -06:00
Mike Place
b0f1846259 Merge pull request #31832 from adelcast/dev/adelcast/disable_master_2 
add disable option to 'master_type' minion config token
 2016-03-15 13:51:02 -06:00
Mike Place
7339f84af1 Merge pull request #31817 from rajvidhimar/enhance-junos 
Enhance junos
 2016-03-15 13:45:40 -06:00
Saravana Periyasamy
f35413dc9e #31899: Added the identifier parameter to get_records, update_records & delete_records, and returned the identifier as part of the ret['changes']. 2016-03-15 14:21:34 -05:00
C. R. Oldham
7428c73724 Merge pull request #31901 from rallytime/bp-31846 
Back-port #31846 to 2015.8
 2016-03-15 13:12:43 -06:00
Borys Pierov
336242fa12 Allow passing pillarenv into state.orchestrate 2016-03-15 14:58:42 -04:00
Mike Place
c28fc6e1d8 Merge pull request #31893 from Unity-Technologies/hotfix/windows-proxy-enable 
Hotfix/windows proxy enable
 2016-03-15 12:58:33 -06:00
Skip Breidbach
54d81b9b42 Fix FULLCONTROL / FILE_ALL_ACCESS definition (bugfix and code simplification). 
Use consistent mechanism fro obtaining user SID.
Allow wildcarding (via optional parameters) for a variety of methods (get, rm_ace, check_ace).
 2016-03-15 11:49:04 -07:00
Mike Place
3a0f1f69b3 Merge pull request #31898 from afletch/patch-1 
Ensure rh_service not used on CloudLinux 7
 2016-03-15 12:47:19 -06:00
Nicole Thomas
37f1ce9be2 Merge pull request #31905 from terminalmage/update-versionadded 
Update versionadded directive
 2016-03-15 12:43:06 -06:00
Erik Johnson
dcc196c9e1 Update versionadded directive 
This fix is going into 2015.8.8 after all.
 2016-03-15 13:41:39 -05:00
Erik Johnson
35f6407d11 Merge pull request #31902 from rallytime/update-version-31857 
Update versionadded tag for new funcs
 2016-03-15 13:41:08 -05:00
rallytime
1a1ce05186 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - .testing.pylintrc
  - salt/cloud/clouds/joyent.py
 2016-03-15 12:34:57 -06:00
Erik Johnson
af29940e1c Use remote_ref instead of local_ref to see if checkout is necessary 2016-03-15 13:27:19 -05:00
rallytime
5cd09150cd Update versionadded tag for new funcs 2016-03-15 12:23:11 -06:00
C. R. Oldham
1edd6ce302 Extra comment. 2016-03-15 12:17:26 -06:00
C. R. Oldham
6c2ef03b11 Fix event bus flood caused by unexpected recursive call. 2016-03-15 12:17:25 -06:00
Mike Place
440e0dcbe0 Merge pull request #31825 from jtand/udpate_pylintrc 
Updated .testing.pylintrc to match newer versions of pylint
 2016-03-15 12:12:44 -06:00
Nicole Thomas
471c9444a3 Merge pull request #31900 from rallytime/fix-psutil-warning 
Add "python module" clarification to ps __virtual__ warning.
 2016-03-15 11:59:35 -06:00
Nicole Thomas
1be9c91761 Merge pull request #31888 from terminalmage/fix-depends-decorator 
Fix salt.utils.decorators.Depends
 2016-03-15 11:09:54 -06:00
Nicole Thomas
4f7aad7be5 Merge pull request #31882 from jacobhammons/rel-notes 
Updated release notes & module reference
 2016-03-15 10:56:36 -06:00
rallytime
22403d69ae Add "python module" clarification to ps __virtual__ warning. 
Added based on comment from Issue #31867
 2016-03-15 10:53:12 -06:00
Nicole Thomas
80feff9596 Merge pull request #31896 from cachedout/doc_31794 
Add docs for master_tries
 2016-03-15 10:01:21 -06:00
afletch
4300266374 Ensure rh_service not used on CloudLinux 7 
Add CloudLinux to RHEL-derived distros excluded from rh_service use in osrelease >= 7
 2016-03-15 15:42:45 +00:00
Mike Place
64ca65954a Add docs for master_tries 
Refs #31794
 2016-03-15 09:29:13 -06:00
Mike Place
8f1ceb7eda Merge pull request #31794 from skizunov/develop2 
Add `master_tries` config option for minions
 2016-03-15 09:24:49 -06:00
Daniel Hobley
415cc8efab Make sure we enable the proxy settings on windows 2016-03-15 12:02:12 +01:00
Daniel Hobley
4884844ad6 Only include state changes if something actually happened 2016-03-15 12:00:41 +01:00
Erik Johnson
394410e2b0 Add integration test for depends decorator 2016-03-14 22:16:10 -05:00
Erik Johnson
caa3cc1007 Fix salt.utils.decorators.Depends 
bebdc266 broke this decorator, because switching from getting the module
to getting a frame means dir(frame) does not contain the imported names.
Those now reside in frame.f_globals and frame.f_locals.

This commit fixes the membership check to look in the proper location.
 2016-03-14 22:16:00 -05:00
Seth Miller
aadac626bc Add NextGen win_servermanager modules 
Add the win_servermanager_ng execution and state modules to support newer Windows 8 and 2012 hosts and above which use the newer Install-WindowsFeature PowerShell cmdlet instead of the deprecated Add-WindowsFeature.
 2016-03-14 19:16:23 -05:00
Seth Miller
47241cb673 Disable win_servermanager on Windows 8 and above 
This change disables win_servermanager for Windows minions version 8 and above to include Windows server version 2012+ so that win_servermanager_ng can takeover for those minions.
 2016-03-14 19:14:52 -05:00
Nicolas Morin
1662a080e1 Update scaleway cloud provider to manage x86 servers 2016-03-14 23:37:01 +01:00
Jacob Hammons
fd7f7bcddf Updated release notes 
Added a shortcut to link to pull requests
Added doc entries for all new modules
removed the unnecessary :undoc-members: option from recent doc module entries
 2016-03-14 16:34:22 -06:00
Mike Place
908b4446b0 Merge pull request #31808 from lyft/reenable-disabled-user 
Allow for users to set expiration date of -1.
 2016-03-14 16:29:12 -06:00