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
62,123 Commits 24 Branches 182 Tags 341 MiB
92962957c8
Commit Graph

62123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
5f081ef31c Merge pull request #33840 from cachedout/remove_matcher_unit_tests 
Remove matcher tests
 2016-06-08 06:31:41 -07: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
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
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
Mike Place
9d36f1e474 Fix broken locate.locate function 
Closes #33810
 2016-06-07 11:02:04 -06:00
Mike Place
1db559afe9 Merge pull request #33805 from jfindlay/pkg_tests 
states.pkg int tests: skip if pkg mgr unavailable
 2016-06-07 07:40:46 -07:00
Mike Place
3984b65486 Merge pull request #33808 from jfindlay/gem_tests 
fix some problems with the gem module integration tests
 2016-06-07 07:40:25 -07:00
Mike Place
c30d8a8c61 Merge pull request #33770 from jfindlay/service_tests 
service state integration tests
 2016-06-07 07:37:54 -07:00
Mike Place
e061788e81 Merge pull request #33814 from terminalmage/archive-extracted-xz 
Support extraction of XZ archives in archive.extracted state
 2016-06-07 07:36:48 -07:00
Erik Johnson
897a716df2 Support extraction of XZ archives in archive.extracted state 
Using an XZ-compressed archive with archive.extracted raises a
tarfile.ReadError exception, as only gzip and bzip2 are supported by
tarfile. This commit catches that exception and attempts to extract
using xz-utils, if present.

It also makes some clarifications and corrections to the documentation.
 2016-06-07 02:07:30 -05:00
Justin Findlay
f13f914755 states.service: add integration tests 2016-06-06 23:11:49 -06:00
Justin Findlay
f7c19a1a58 modules.gem int tests: relax version checks 2016-06-06 21:58:58 -06:00
Justin Findlay
0c069ddc95 states.pkg int tests: skip if pkg mgr unavailable 2016-06-06 17:44:43 -06:00
Justin Findlay
6af47d2ba7 modules.gem int tests: remove pkgs before testing install 2016-06-06 17:32:17 -06:00
Justin Findlay
90aee79c39 states.service.mod_watch: update unit test 2016-06-06 10:54:16 -06:00
Justin Findlay
d210a92f09 states.service.mod_watch: update sfun and force docs 2016-06-06 10:13:06 -06:00
Mike Place
7fdfbe9a28 Merge pull request #33691 from jtand/gem_integration_test 
Gem integration test
 2016-06-06 04:13:23 -07:00
Mike Place
bb4194bb79 Merge pull request #33777 from sodium-chloride/2015.8-2016-0604-1939 
Fix minor docstring issue of arg being missing
 2016-06-06 03:44:59 -07:00
Mike Place
fa983e91cf Merge pull request #33778 from sodium-chloride/2015.5-2016-0604-1938 
Fix minor docstring issues
 2016-06-06 03:44:16 -07:00
Jεan Sacren
c1fd830a1a Fix minor docstring issue of arg being missing 
The network.get_bufsize function requires an interface for arg. In the
example that part is missing. Add arbitrary 'eth0' for clarity.
 2016-06-04 19:44:31 -06:00
Jεan Sacren
a5fb6d7a69 Fix minor docstring issues 
The network.get_bufsize function requires an interface for arg. In the
example, the argument is missing and the function name is a little bit
off. Add arbitrary 'eth0' for argument and correct the name.
 2016-06-04 19:41:36 -06:00
Mike Place
c749aea409 Merge pull request #33759 from cachedout/issue_31219 
Catch no minions exception in batch mode
 2016-06-03 14:22:49 -07:00
Mike Place
15a39f8646 Catch no minions exception in batch mode 
Closes #31219
 2016-06-03 14:22:11 -06:00
Mike Place
47d668e071 Merge pull request #33719 from cachedout/fixup_33653 
Catch oserror for race condition
 2016-06-03 10:25:26 -07:00
Mike Place
11e39e7203 Merge pull request #33712 from meaksh/fix-for-groupadd-module-failures-in-SLE11-2015.8 
Fix for groupadd execution module failures in SLES11 systems
 2016-06-03 09:13:06 -07:00
Mike Place
2c450a7494 Merge pull request #33718 from rallytime/bp-33700 
Back-port #33700 to 2015.8
 2016-06-03 09:10:44 -07:00
Mike Place
b9133326c8 Merge pull request #33726 from jtand/sysmod_skip_valid_docs_glance 
glance.warn_until shouldn't be checked for a doc string
 2016-06-03 09:06:08 -07:00
Mike Place
b07701f0a0 Merge pull request #33727 from terminalmage/issue33725 
Fix git_pillar edge case for remote repos without a master branch
 2016-06-03 09:03:59 -07:00
Mike Place
015e50cec8 Merge pull request #33728 from jfindlay/test_state_test 
Make `configurable_test_state` configurable in test mode
 2016-06-03 09:02:57 -07:00
Mike Place
1cf8fe3f1d Merge pull request #33729 from twangboy/fix_win_servermanager 
Add exclude option to win_servermanager
 2016-06-03 08:53:13 -07:00
Mike Place
6c150d840d Merge pull request #33743 from vutny/drop-debian-community-repo-doc 
Debian installation docs: drop section about community-maintained repo
 2016-06-03 08:29:45 -07:00
Justin Anderson
ff2dae103d ubuntu doesn't install default gems when ruby is installed 2016-06-03 08:54:51 -06:00
Pablo Suárez Hernández
ab738416ba pylint fix 2016-06-03 13:57:13 +01:00
Pablo Suárez Hernández
bf27e5d36e test_members cleanup 2016-06-03 13:25:05 +01:00
Pablo Suárez Hernández
ba815dbf76 improvements on groupadd unit tests 2016-06-03 13:17:13 +01:00
Justin
504df9a65a Fixed lint error 2016-06-03 04:28:42 -06:00
Pablo Suárez Hernández
3bbc5ae0d9 one line is better 2016-06-03 10:08:32 +01:00
Justin Findlay
87e018af2a states.test.configurable_test_state: add unit tests 2016-06-02 17:20:36 -06:00
twangboy
2de91d166f Fix docstring 2016-06-02 16:41:13 -06:00
Justin Anderson
0cb1bfa0d3 Removed extra : 2016-06-02 16:35:40 -06:00
Erik Johnson
d8ba7ed5a5 Fix git_pillar edge case for remote repos without a master branch 
When the remote repository does not have a master branch, on the initial
checkout there will be no ref in refs/remotes/origin for this branch,
leading to an error being logged and the checkout failing.

Instead of failing the checkout, in these cases we'll create the initial
local HEAD based on the ref we will eventually check out, since we know
for a fact that this ref exists.

Resolves #33725
 2016-06-02 17:33:07 -05:00
Justin Anderson
ebee8a89af glance.warn_until shouldn't be checked for a doc string 2016-06-02 16:30:36 -06:00