Mike Place
9e206b67fa
Merge pull request #37222 from xofyarg/develop
...
decode pillar on minion side on receiving
2016-10-27 15:17:31 +09:00
Mike Place
de97e8ccdc
Merge pull request #37243 from twangboy/win_wua_state
...
win_wua state and util
2016-10-27 15:17:03 +09:00
Mike Place
85bef69ce4
Merge pull request #37248 from alexbleotu/get_properties_of_managed_object-gh
...
Get properties of managed object gh
2016-10-27 15:16:27 +09:00
Mike Place
f2538206f9
Merge pull request #37249 from alexbleotu/zeromq_failing_test-gh
...
Increased timeout to test_badload zeromq test
2016-10-27 15:15:51 +09:00
Mike Place
279d64d79e
Merge pull request #37262 from lomeroe/win_lgpo_fixes
...
correct issues in win_lgpo module
2016-10-27 15:14:44 +09:00
Ethan Moore
a8b7ffd7ef
correctly handle scenario when "storeAsText" is True on a decimal/longDecimal element object
...
handle scenario that gpedit has not been run on a system (Machine and User GroupPolicy sub-folders do not exist)
handle scenario that startup/shutdown script policy file does not exist
2016-10-26 21:22:17 +00:00
Nicole Thomas
d5d6b72ed7
Merge pull request #37255 from rallytime/merge-develop
...
[develop] Merge forward from carbon to develop
2016-10-26 11:11:10 -06:00
rallytime
190ec32283
Merge branch 'carbon' into 'develop'
...
Conflicts:
- doc/topics/cloud/vmware.rst
- salt/cloud/clouds/vmware.py
2016-10-26 10:09:26 -06:00
twangboy
59165228f4
Remove apostrophes (GUID's, KB's)
2016-10-26 09:13:47 -06:00
twangboy
ddee86c27c
Fix some more lint
2016-10-26 09:11:10 -06:00
C. R. Oldham
338e3987f0
Merge pull request #37143 from rajvidhimar/feature-enhancements
...
Feature enhancements
2016-10-26 07:22:15 -06:00
Alexandru Bleotu
1a96f11269
Increased timeout to test_badload zeromq test
2016-10-26 08:04:42 -04:00
Alexandru Bleotu
c0b45afa54
Added tests for salt.utils.vmware.get_properties_of_managed_object
2016-10-26 06:37:32 -04:00
Alexandru Bleotu
4ff0f3bcbe
Added get_properties_of_managed_object in salt.utils.vmware
...
- optimally retrieves the properties of a managed object
2016-10-26 05:53:40 -04:00
Mike Place
0881caae96
Merge pull request #37247 from cachedout/carbon_develop
...
Carbon -> develop
2016-10-26 15:49:02 +09:00
Mike Place
fc0fb5cf0c
Merge pull request #37246 from cachedout/2016_3_carbon
...
2016.3 -> carbon
2016-10-26 15:16:50 +09:00
Mike Place
05079a206a
Merge branch 'carbon' into carbon_develop
2016-10-26 14:12:37 +09:00
Mike Place
afd3dc3807
Merge branch '2016.3' into 2016_3_carbon
2016-10-26 14:08:03 +09:00
Mike Place
2010d41f47
Merge pull request #37229 from rallytime/merge-carbon
...
[carbon] Merge forward from 2016.3 to carbon
2016-10-26 14:05:26 +09:00
rallytime
409e48f26b
Remove duplicate `destroy` function from minion.py
...
This was added during a merge forward from 2016.3 to carbon.
2016-10-25 20:56:20 -06:00
Mike Place
d1a6bb72ac
Merge pull request #37218 from darkalia/37187_supervisor_2016.3
...
Issue #37187 Do not parse first /proc/1/cmdline binary if it's not *b…
2016-10-26 10:41:03 +09:00
Mike Place
fa20c4c128
Merge pull request #37223 from alexbleotu/get_service_instance_from_managed_object-gh
...
Get service instance from managed object gh
2016-10-26 10:35:02 +09:00
Mike Place
15ea1decda
Merge pull request #37227 from jfindlay/init_kwargs
...
cloud.__init__: convert kwargs to dict before **
2016-10-26 10:17:22 +09:00
Mike Place
760ed9f56d
Merge pull request #37239 from Ch3LL/fix_cloud_timeout
...
Fix cloud tests timeout
2016-10-26 10:11:52 +09:00
Mike Place
b8bd051ebb
Merge pull request #37242 from dmurphy18/amzn_building
...
Refined rpm building natively on Amazon Linux
2016-10-26 10:11:15 +09:00
Mike Place
6c5f619398
Merge pull request #37244 from rallytime/update-bootstrap
...
Update bootstrap release to 2016.10.25
2016-10-26 09:46:29 +09:00
Mike Place
bb7caf8c42
Merge pull request #37245 from rallytime/bp-36334
...
Back-port #36334 to 2016.3
2016-10-26 09:41:00 +09:00
twangboy
0a28bd13ae
Fix some lint
2016-10-25 17:00:38 -06:00
Aditya Kulkarni
f64ca3c442
Update release notes and version added
2016-10-25 16:16:46 -06:00
Aditya Kulkarni
0a3d266d6b
Add ability to specify disk backing mode for VMware cloud profile
2016-10-25 16:15:30 -06:00
rallytime
f728a5bc7b
Update bootstrap release to 2016.10.25
2016-10-25 15:54:53 -06:00
twangboy
488a481c9a
Add top level docs for wua state module
2016-10-25 15:13:16 -06:00
twangboy
e4964e5eaa
Add wua.removed state function
2016-10-25 14:52:18 -06:00
David Murphy
6bc1dfdeeb
Refined rpm building natively on Amazon Linux
2016-10-25 14:26:55 -06:00
Ch3LL
394fccf556
fix run_cloud timeout
2016-10-25 13:30:41 -06:00
Ch3LL
23947c5944
change timeout for cloud tests
2016-10-25 13:27:57 -06:00
twangboy
ddcc53bc30
Add documentation to the salt util
2016-10-25 12:45:23 -06:00
twangboy
eb5b6fe8c3
deprecated older functions
2016-10-25 12:45:23 -06:00
twangboy
0883c02557
fix syntax errors
2016-10-25 12:45:23 -06:00
twangboy
a66777e6b6
Make needs_reboot not part of class
2016-10-25 12:45:23 -06:00
twangboy
50a1440d57
Add WUSA uninstall, add needs_reboot check
2016-10-25 12:45:23 -06:00
twangboy
57558d2e16
Change from win_wua to win_udates
2016-10-25 12:45:23 -06:00
twangboy
d0da164350
Fix docs
2016-10-25 12:45:23 -06:00
twangboy
b2f9f61e21
Add ability to uninstall updates
2016-10-25 12:45:23 -06:00
twangboy
f0548906a1
Add available function
2016-10-25 12:45:23 -06:00
twangboy
77d4966ed4
Add win_wua salt util
2016-10-25 12:45:23 -06:00
twangboy
f26c7d0fd5
Add wua.installed state
2016-10-25 12:45:23 -06:00
Nicole Thomas
3c94315d35
Merge pull request #37233 from rallytime/bp-37154
...
Back-port #37154 to 2016.3
2016-10-25 12:32:56 -06:00
Nicole Thomas
94852f2eb1
Merge pull request #37232 from rallytime/bp-37153
...
Back-port #37153 to 2016.3
2016-10-25 12:32:41 -06:00
Nicole Thomas
534f510756
Merge pull request #37230 from rallytime/merge-develop
...
[develop] Merge forward from carbon to develop
2016-10-25 12:23:42 -06:00
