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
67,991 Commits 24 Branches 182 Tags 341 MiB
595d4f2ac3
Commit Graph

67991 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
595d4f2ac3 Fixup new groupadd tests for syntax change in 2016.3 2016-06-08 12:42:52 -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
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
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
Nicolas Delaby
0d40e1c4f3 Add support for edge case when Cmd and Entrypoint can't be blanked 2016-06-08 10:46:24 +02: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
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
Mike Place
9d36f1e474 Fix broken locate.locate function 
Closes #33810
 2016-06-07 11:02:04 -06: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
twangboy
8d66fac74c Add missing unit tests 2016-06-07 09:53:22 -06:00
Mike Place
52f1f77a38 Restore deafault log level to warning 
Closes #33818
 2016-06-07 08:48:05 -06:00
Mike Place
3e48b701e3 Merge pull request #33767 from amontalban/2016.3 
Fix #33604 implementation when 'geom disk list' does not output rotat…
 2016-06-07 07:41:56 -07: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
a84588c788 Merge pull request #33806 from cachedout/cherrypy_1444 
Work around upstream cherrypy bug
 2016-06-07 07:39:57 -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
Daniel Hobley
8ff5906fad Revert "Fix a bug when creating a new VM and changing the network info" 
This reverts commit 7834aeda7d.
 2016-06-07 11:41:22 +02: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
twangboy
60f856f73d Fix unit tests for module 2016-06-06 18:33:29 -06:00
twangboy
b574947afe Fix some lint errors 2016-06-06 18:08:17 -06:00
Justin Findlay
0c069ddc95 states.pkg int tests: skip if pkg mgr unavailable 2016-06-06 17:44:43 -06:00
twangboy
a32774c07d Add salt.utils.compare_lists 2016-06-06 17:43:15 -06:00
Justin Findlay
6af47d2ba7 modules.gem int tests: remove pkgs before testing install 2016-06-06 17:32:17 -06:00
twangboy
7ff7050705 Fix incorrect parameters in the state 2016-06-06 17:28:39 -06:00
twangboy
b8ee89f18e Fix typos 2016-06-06 17:04:02 -06:00
Mike Place
1b537d41b6 Work around upstream cherrypy bug 
Refs https://github.com/cherrypy/cherrypy/issues/1444
 2016-06-06 16:54:06 -06:00
twangboy
10458d8a70 Remove multiple lookups, faster 2016-06-06 16:50:37 -06:00
twangboy
d9b848c0d9 Change to dict instead of error 2016-06-06 16:33:24 -06:00
twangboy
6510e0a5b0 Add restart option 2016-06-06 15:12:43 -06:00
twangboy
da8562dbc8 Add quiet and norestart options 2016-06-06 14:58:38 -06:00
twangboy
946371bf1f Handle errors, ensure add/remove 2016-06-06 14:34:46 -06:00
twangboy
7e6382a8b2 Use list instead of string for cmd 2016-06-06 12:58:34 -06:00
twangboy
fbdd28f144 Add state functions 2016-06-06 12:21:49 -06:00
twangboy
90a4ee3d96 Merge branch '2016.3' of https://github.com/saltstack/salt into win_dism 2016-06-06 10:54:34 -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
94f98b4ab8 Merge pull request #33776 from danslimmon/s3-bucket-idempotency-33754 
Fixed ACL user comparison. Resolves #33754.
 2016-06-06 04:11:15 -07:00
Mike Place
a92e155a04 Merge pull request #33763 from abednarik/abednarik_zypper_no_refresh_fix 
Insert --no-refresh before install in Zypper.
 2016-06-06 03:53:27 -07:00
Mike Place
306848a2d7 Merge pull request #33764 from terminalmage/issue33647 
Merge instead of update pillar overrides
 2016-06-06 03:52:22 -07:00
Mike Place
b37a862b70 Merge pull request #33772 from danslimmon/trough-through 
Fixed spelling of "through"
 2016-06-06 03:50:54 -07:00