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
75,309 Commits 24 Branches 182 Tags 341 MiB
13086c580b
Commit Graph

75309 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
9f5cdf1d49 Merge pull request #37193 from cro/allow_host_from_scratch 
Allow VMs created from scratch to be assigned to a specific host
 2016-10-27 15:33:10 +09:00
Mike Place
c0ca1a3e0d Merge pull request #37198 from t2b/issue-36587-v2 
don't pull image in dockerng.running if test=true
 2016-10-27 15:30:09 +09:00
Mike Place
170b5eb381 Merge pull request #37199 from t2b/cleanup-dockerng-v2 
remove unnecessary call of _get_defaults_from_image
 2016-10-27 15:28:06 +09:00
alex-zel
b5b2e7e097 Remove trailing whitespaces 
Remove trailing whitespaces, change line 345 from 'if' to 'elif'
 2016-10-27 09:27:33 +03:00
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
d0ce3de50c Merge pull request #37252 from vutny/suppress-init-grain-error 
Set logging level to 'info' for message about init system detection
 2016-10-27 15:15:01 +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
47290d88a2 Update man pages for the 2016.3 branch (#37259) 2016-10-26 13:32:38 -06:00
Nicole Thomas
2087cfce90 Merge pull request #37257 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-10-26 11:32:36 -06: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
Thomas S Hatch
ea6155c3f4 Merge pull request #37254 from DSRCorporation/bugs/37191_minion_hangs 
Bugs/37191 minion hangs
 2016-10-26 10:28:41 -06:00
rallytime
2066f10d7b Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-10-26 10:16:05 -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
Dmitry Kuzmenko
9ee24b2d70 Revert "Don't set the daemon flag for LoggingQueue process." 
This reverts commit c9c45a5d79.
 2016-10-26 17:09:19 +03:00
C. R. Oldham
338e3987f0 Merge pull request #37143 from rajvidhimar/feature-enhancements 
Feature enhancements
 2016-10-26 07:22:15 -06:00
Denys Havrysh
3f20cc01ed Set logging level to 'info' for message about init system detection 2016-10-26 15:56:28 +03: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
ttb
9e49010bc5 reraise CommandExecutionError of dockerng.inspect_image if not test=true 2016-10-25 23:53:16 +02:00
C. R. Oldham
6a7eab9e16 Remove this test, it is no longer illegal to leave out image 
and clonefrom parameters.  It is possible to create a VM from scratch.
 2016-10-25 15:23:32 -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
ttb
0ccd75338d be more specific in dockerng.runnning comment if test=true 
a missing local image can also mean that a running container will be
replaced with one based on the new image
 2016-10-25 21:40:17 +02: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