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
66,585 Commits 24 Branches 182 Tags 341 MiB
4302adb1fd
Commit Graph

66585 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
justinta89
9a14e02766 Updated beacons/sh.py to work with enumerate() 2016-03-14 16:13:40 -06:00
Mike Place
c44c1b5e59 Merge pull request #31878 from rallytime/fix-psutil-warning 
Make sure __virtual__ error message is helpful when psutil is missing
 2016-03-14 15:31:42 -06:00
justinta89
0ecec691a0 Adjusted beacons to work with enumerate better 2016-03-14 14:33:32 -06:00
Nicole Thomas
d357e4ea44 Merge pull request #31857 from sjorge/solarish_shadow 
gen_password and del_password missing from solaris_shadow
 2016-03-14 14:29:50 -06:00
Nicole Thomas
1b0b2d3f1a Merge pull request #31879 from cro/idrac_fixes_0314 
Clarify some comments
 2016-03-14 13:59:35 -06:00
Jorge Schrauwen
38231303f3 .9 release as mentioned by rallytime 2016-03-14 19:41:20 +00:00
Jorge Schrauwen
3e25f70968 fix version added 2016-03-14 19:39:54 +00:00
C. R. Oldham
42ef3a7970 Extra comment. 2016-03-14 13:12:06 -06:00
rallytime
44b29f72a1 Make sure __virtual__ error message is helpful when psutil is missing 
Fixes #19659
Fixes #31867
 2016-03-14 12:33:53 -06:00
Nicole Thomas
2c0edf25fd Merge pull request #31874 from rallytime/fix-doc-errors 
Fix doc test errors for boto_datapipeline and boto_iot modules
 2016-03-14 12:19:03 -06:00
Andreas Lutro
2aceacdfcb set option.explicit when passing from Saltfile 
fixes #27491
 2016-03-14 19:05:13 +01:00
Mike Place
fb81bbea23 Merge pull request #31815 from dr4Ke/fix_template_on_contents_2015.8 
Fix template on contents 2015.8
 2016-03-14 11:41:46 -06:00
justinta89
f509b4113e Fixed final lint error 2016-03-14 11:28:40 -06:00
Mike Place
aa120cb716 Merge pull request #31818 from alprs/fix-event_logging_spam 
Prevent event logs from writing huge amounts of data
 2016-03-14 11:27:47 -06:00
rallytime
51c4840bde Update CLI Examples for boto_iot module 2016-03-14 11:13:13 -06:00
rallytime
c81ee0c3f8 Update CLI Examples for boto_datapipeline module 2016-03-14 11:04:15 -06:00
Mike Place
4adc25b3b3 Merge pull request #31830 from Unity-Technologies/hotfix/keychain-cert-changed 
Hotfix/keychain cert changed
 2016-03-14 10:59:54 -06:00
justinta89
5945b3f11f Fix and disable pylint errors 2016-03-14 10:38:07 -06:00
justinta89
06ae6eaf55 Fixed pylint errors on jboss state and module 2016-03-14 10:34:51 -06:00
Mike Place
f2445bdbdc Merge pull request #31836 from terminalmage/issue31293 
Fix git_pillar race condition
 2016-03-14 09:48:28 -06:00
justinta89
de96db97c8 Fixed more pylint errors, and disabled some more 2016-03-14 09:42:08 -06:00
Mike Place
8268e9b289 Merge pull request #31846 from cro/proxy_infinite_loop 
Proxy infinite loop
 2016-03-14 09:17:13 -06:00
C. R. Oldham
c739127ac5 Extra comment. 2016-03-14 07:15:46 -06:00
C. R. Oldham
5366daafa8 Fix event bus flood caused by unexpected recursive call. 2016-03-14 07:15:46 -06:00
Daniel Hobley
4d75b817af Lint fixes 2016-03-14 09:32:45 +01:00
Nicole Thomas
5464be07b1 Merge pull request #31824 from rallytime/bp-31819 
Back-port #31819 to 2015.8
 2016-03-13 13:59:32 -06:00
Nicole Thomas
7781b357e0 Merge pull request #31856 from szeestraten/add-missing-docs-for-azure-cloud-profile 
Adds missing docs for Virtual Network and Subnet options in salt-cloud Azure cloud profile
 2016-03-13 13:06:52 -06:00
Jorge Schrauwen
d768ed25b4 develop, 2016.3 and 2015.8 has missing gen_password and del_password for shadow module 2016-03-13 15:33:37 +00:00
Sandor Zeestraten
a1a2229405 Adds missing docs for Azure cloud profile 
Adds documentation for feature introduced in #24559 in salt-cloud
to specify virtual network and subnet in the Azure cloud profile.
 2016-03-13 14:27:49 +01:00
Nicole Thomas
aed7d2abb1 Merge pull request #31853 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-03-12 20:00:31 -07:00
Nicole Thomas
5c592b6768 Merge pull request #31852 from rallytime/merge-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2016-03-12 19:47:02 -07:00
rallytime
54c76ebf33 Merge branch '2015.8' into '2016.3' 2016-03-12 19:12:08 -07:00
rallytime
1470de17fa Merge branch '2014.7' into '2015.5' 2016-03-12 19:08:20 -07:00