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
68,259 Commits 24 Branches 182 Tags 341 MiB
80e9d1d278
Commit Graph

68259 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Andres Montalban
b8c0dd5b4c Fix #33604 implementation when 'geom disk list' does not output rotationrate. #33578 2016-06-05 19:26:36 -03: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
Dan Slimmon
35b84f1877 Fixed bug where _prep_acl_for_compare() would edit but not return 2016-06-04 15:35:00 +00:00
Dan Slimmon
f87bc347fd Fixed ACL user comparison. Resolves #33754. 2016-06-04 15:14:00 +00:00
Dan Slimmon
ea3498aedc Fixed spelling of "through" 2016-06-04 03:08:22 +00:00
twangboy
00c24abe1f Add get functions 2016-06-03 17:50:43 -06:00
twangboy
c6621053fd Add additional functions 2016-06-03 17:03:50 -06:00
twangboy
36507845b6 Update documentation 2016-06-03 17:03:50 -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
Erik Johnson
914003c995 Merge instead of update pillar overrides 
An earlier commit (made in develop the 2015.8 release branch was
created) added the ability to decrypt CLI pillar overrides. As this was
an entirely new block of code in the 2016.3 release branch, when a CLI
pillar override issue was fixed in 2015.8, the fix did not make it to
2016.3.

This commit fixes this issue by merging the CLI pillar data instead of
using dict.update().

Resolves #33647.
 2016-06-03 16:05:14 -05:00
abednarik
7c909a1d7f Insert --no-refresh before install in Zypper. 
Instead of appending --no-refresh after install, this will insert --no--refresh as
the first element of the list.
 2016-06-03 18:03:46 -03:00
Mike Place
a8d9221631 Merge pull request #33651 from cachedout/issue_33614 
Restore grains context to renderers
 2016-06-03 13:48:44 -07:00
Mike Place
5518e1dd14 Fix whitespace 2016-06-03 14:48:26 -06:00
Mike Place
15a39f8646 Catch no minions exception in batch mode 
Closes #31219
 2016-06-03 14:22:11 -06:00
Mike Place
7b50e1766e Better fix 
Just use opts grains int he loader and fall back to empty dict
 2016-06-03 13:49:51 -06:00
Mike Place
daf462e430 Merge pull request #33757 from cachedout/state_set_doc 
Reminder not to return non-serializable data from states
 2016-06-03 12:23:54 -07:00
Mike Place
500d4ccec2 Reminder not to return non-serializable data from states 
Refs #31837
 2016-06-03 12:13:47 -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
a5684ed123 Merge pull request #33670 from rallytime/fix-33605 
Handle non-ascii package names in state.format_log
 2016-06-03 09:16:52 -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
56eab363ff Merge pull request #33723 from rallytime/bp-33641 
Back-port #33641 to 2016.3
 2016-06-03 09:07:53 -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
Mike Place
c2b970789c Merge pull request #33748 from ticosax/adjust-api-version-host-config 
HostConfig has been introduced by docker api version 1.15
 2016-06-03 08:28:40 -07:00
Mike Place
e08c685a6c Merge pull request #33745 from eliasp/2016.3-typo-privilages-privileges 
Typo (`privilages` → `privileges`)
 2016-06-03 08:14:37 -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
Nicolas Delaby
134e4a9abf HostConfig has been intoriduced by docker api version 1.15 2016-06-03 11:46:55 +02:00
Pablo Suárez Hernández
3bbc5ae0d9 one line is better 2016-06-03 10:08:32 +01:00