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
70,247 Commits 24 Branches 182 Tags 341 MiB
9a856bde82
Commit Graph

70247 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thayne Harbaugh
ed1981f289 Pass through "greedy" parameter rather than hard-coded "True" 2016-06-08 16:57:31 -06:00
Justin Findlay
06f249901a add 2016.3.1 release notes (#33883) 2016-06-08 16:49:28 -06:00
rallytime
398534a9e7 Fix ret return from merge-conflict resolution 2016-06-08 16:16:19 -06:00
Ethan Moore
ce8df5bc1d update archive.state to allow passing kwargs to archive.unzip/archive.unrar -- currently to allow passing the 'extract_perms' kwarg 2016-06-08 21:58:37 +00:00
Ethan Moore
aaf5e17ae5 Add parameter to unzip to set permissions on extracted files to match that of the file/directory attributes in a zip archive 2016-06-08 21:52:00 +00:00
rallytime
b8e4706074 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/modules/saltutil.py
  - salt/states/archive.py
 2016-06-08 14:26:18 -06:00
Erik Johnson
ad4f903262 Use absolute imports in salt.utils.dns (#33871) 
Resolves #33834.
 2016-06-08 16:16:15 -04:00
Nicole Thomas
be20ce1bbf Merge pull request #33866 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-06-08 15:49:56 -04:00
rallytime
595d4f2ac3 Fixup new groupadd tests for syntax change in 2016.3 2016-06-08 12:42:52 -06:00
Mike Place
669aa92d59 Merge pull request #33860 from cachedout/issue_33843 
Allow socket closes when the socket is disconnected
 2016-06-08 11:26:16 -07:00
Mike Place
2c88e22c07 Use errno 2016-06-08 11:26:48 -06:00
rallytime
c5b4ec0b0f Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cli/salt.py
  - salt/modules/groupadd.py
  - salt/states/service.py
 2016-06-08 11:20:18 -06:00
Mike Place
b183a3645c Set master and cloud to log level warning (#33861) 
Refs #33821 and #33818
 2016-06-08 12:43:26 -04:00
Mike Place
42c5058a1e Add tcptraceroute suggestion to minion troubleshooting docs (#33862) 
Closes #33627
 2016-06-08 12:19:27 -04:00
Mike Place
e7de99dd0e Correct silly mistake 2016-06-08 09:57:39 -06:00
Hilberding, Rob
061ebfdd9d Fixed pylint 2016-06-08 11:39:43 -04:00
Mike Place
7a46360a13 Allow socket closes when the socket is disconnected 
This prevents stacktraces when the master is signaled for a shutdown
but the sockets are already disconnected.

Closes #33843
 2016-06-08 09:04:58 -06:00
Nicole Thomas
5db38417dc Lint fix for develop (#33859) 2016-06-08 10:56:04 -04:00
Nicole Thomas
9960cea98a Lint fix for develop (#33859) 2016-06-08 10:55:58 -04:00
Hilberding, Rob
73c629b6a4 Added a join domain state function 2016-06-08 10:48:48 -04:00
Mike Place
a3202f1ad6 Merge pull request #33698 from Unity-Technologies/vsphere-fixes 
Vsphere fixes
 2016-06-08 07:12:17 -07:00
Mike Place
01aaf3e2a9 Merge pull request #33771 from twangboy/win_dism 
Additional functionality to win_dism.py
 2016-06-08 06:58:20 -07:00
Mike Place
f546e47552 Merge pull request #33851 from ticosax/fix-entrypoint-support 
[dockerng] Add support for edge case when `Cmd` and `Entrypoint` can't be blanked
 2016-06-08 06:52:40 -07:00
Mike Place
ec09095c45 Merge pull request #33827 from cachedout/issue_33810 
Fix broken locate.locate function
 2016-06-08 06:49:56 -07:00
Mike Place
0d93e00879 Merge pull request #33838 from techhat/azureblobs 
Delete disks/blobs on Azure ARM
 2016-06-08 06:49:05 -07:00
Mike Place
cdda593c50 Merge pull request #33829 from terminalmage/update-versionchanged 
Update versionchanged directive
 2016-06-08 06:45:45 -07:00
Mike Place
b8e6c144d8 Merge pull request #33833 from terminalmage/issue33645 
Support syncing pillar modules to masterless minions
 2016-06-08 06:43:16 -07:00
Mike Place
3b8fe7e910 Merge pull request #33847 from whiteinge/doc-eauth-args-kwargs 
Add docs for arg/kwarg eauth matching
 2016-06-08 06:38:58 -07:00
Mike Place
f7b3d0eda0 Merge pull request #33839 from cachedout/fix_pkgresource_test_stacktrace 
Fix another unit test stacktrace in pkg_resource
 2016-06-08 06:32:55 -07:00
Mike Place
6846547d68 Merge pull request #33828 from eyj/manage_target 
Fixed manage.down for targeting subset of nodes
 2016-06-08 06:32:43 -07:00
Mike Place
5f081ef31c Merge pull request #33840 from cachedout/remove_matcher_unit_tests 
Remove matcher tests
 2016-06-08 06:31:41 -07:00
Nicolas Delaby
0d40e1c4f3 Add support for edge case when Cmd and Entrypoint can't be blanked 2016-06-08 10:46:24 +02:00
Seth House
5ed152fe9b Add docs for arg/kwarg eauth matching 
This adds documentation for the addition in #29153.
 2016-06-07 20:53:45 -06:00
Joseph Hall
f0b6944ee9 Delete disks/blobs on Azure ARM 2016-06-07 19:09:00 -06:00
Mike Place
6297448377 Remove matcher tests 
These all assert directly against mock objects. They're pointless.
 2016-06-07 16:36:01 -06:00
Thomas S Hatch
1e49976e71 fix the loader.py docstring. (#33835) 
Because this old one was a whole lot of WHA?!?!?
 2016-06-07 18:23:55 -04:00
Mike Place
435547a747 Fix another unit test stacktrace in pkg_resource 2016-06-07 15:55:52 -06:00
Mike Place
cda032dab2 Merge pull request #33836 from cachedout/fix_winserver_manager_test 
Fixing more stupid unit tests
 2016-06-07 14:34:04 -07:00
Mike Place
453fb1ac91 Fixing more stupid unit tests 
This time win_servermanager
 2016-06-07 15:33:12 -06:00
twangboy
9be45fe37a Fix some more lint 2016-06-07 13:17:29 -06:00
twangboy
421dc97957 Fix/add unit tests for state 2016-06-07 12:52:01 -06:00
Erik Johnson
91745c2a67 Support syncing pillar modules to masterless minions 
Resolves #33645.
 2016-06-07 13:50:48 -05:00
Erik Johnson
f7028eb1c6 Update versionchanged directive 
This change did not make it into 2015.5.11, and it is not certain at
this time whether or not we will do a 2015.5.12.
 2016-06-07 12:26:02 -05:00
Nasenbaer
ecb6663dfd Fixed manage.down for targeting subset of nodes 2016-06-07 19:19:22 +02:00
Mike Place
9d36f1e474 Fix broken locate.locate function 
Closes #33810
 2016-06-07 11:02:04 -06:00
Mike Place
bc0f902c7c Merge pull request #33825 from eyj/manage_target 
Enable targeting of subsets in manage.up/down/status runner module
 2016-06-07 09:53:06 -07:00
Mike Place
3f6d06a060 Merge pull request #33821 from cachedout/issue_33818 
Restore deafault log level to warning
 2016-06-07 09:51:46 -07:00
Mike Place
06b5106bed Merge pull request #33824 from eyj/concurrent_states 
Allow concurrent runs for state single
 2016-06-07 09:51:32 -07:00
twangboy
8d66fac74c Add missing unit tests 2016-06-07 09:53:22 -06:00
Nasenbaer
7885578519 Enable targeting of subsets in manage.up/down/status runner module 2016-06-07 17:47:16 +02:00