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
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
e7de99dd0e
Correct silly mistake
2016-06-08 09:57:39 -06: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
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
Nicolas Delaby
0d40e1c4f3
Add support for edge case when Cmd and Entrypoint can't be blanked
2016-06-08 10:46:24 +02: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
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
a84588c788
Merge pull request #33806 from cachedout/cherrypy_1444
...
Work around upstream cherrypy bug
2016-06-07 07:39:57 -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
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
twangboy
a32774c07d
Add salt.utils.compare_lists
2016-06-06 17:43:15 -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
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
Andres Montalban
b8c0dd5b4c
Fix #33604 implementation when 'geom disk list' does not output rotationrate. #33578
2016-06-05 19:26:36 -03: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
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
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
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
