valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
75,192 Commits 24 Branches 182 Tags 341 MiB
e12f99ff1f
Commit Graph

75192 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nitin Madhok
e12f99ff1f Refactoring vmware cloud driver code (#37292) 
* Refactoring vmware cloud driver code

* Fixing typo

* Function argument is called disk instead of device
 2016-10-28 09:34:33 -06:00
Eric Radman
f42480a1a9 Joyent: wait for node state to flip to 'ready' (#37305) 
When provisioning a SmartOS machine on Joyent using salt-cloud, the IP
is often set before SSH is fully configured. This can result in a
successful SFTP transfer, followed by a failure to run
salt-bootstrap.sh.
 2016-10-28 09:32:54 -06:00
Mike Place
af81bac4ca Merge pull request #37169 from mchugh19/develop 
Allow zabbix_host state to assign templates
 2016-10-28 14:10:54 +09:00
Mike Place
69a8c07ae3 Merge pull request #37271 from Unity-Technologies/feature/choco_install_version 
Added ability to upgrade a chocolatey package when a new version is s…
 2016-10-28 13:23:17 +09:00
Mike Place
76b32271bf Merge pull request #37283 from jeanpralo/fix-dockercompose-versioncheck 
Handle docker-compose up to version 1.9.0
 2016-10-28 13:13:03 +09:00
Mike Place
49df15babb Merge pull request #37277 from cloudflare/NAPALM-GRAINS 
Napalm grains
 2016-10-28 13:10:37 +09:00
Mike Place
ba4c91539d Merge pull request #37275 from cloudflare/NAPALM-PROXY-UPDATE 
Update NAPALM proxy module
 2016-10-28 13:10:15 +09:00
Alexandru Bleotu
a777d6eced Get managed object name gh (#37276) 
* Added get_managed_object_name to optimally retrieve a managed object's name

* Added tests for get_managed_obect_name
 2016-10-27 16:27:27 -06:00
Jean Praloran
d13072a9c7 handle up to version 1.9.0 2016-10-28 10:21:33 +13:00
Mircea Ulinic
0ba8a2e5b9
Add NAPALM grains to docs 2016-10-27 15:50:46 +00:00
Mircea Ulinic
b8a3cdc9e1
NAPALM grains module 2016-10-27 15:50:38 +00:00
Mircea Ulinic
aac14c7095
Update NAPALM proxy module 2016-10-27 15:24:04 +00:00
Daniel Hobley
e4e5ecd9d4 Added ability to upgrade a chocolatey package when a new version is specified 2016-10-27 11:03:50 +02:00
Mike Place
a875b90742 Merge pull request #37269 from cachedout/nt_hash_docs 
Add missing docs for nt_hash
 2016-10-27 17:27:31 +09:00
Mike Place
5ef205d883
Add missing docs for nt_hash 2016-10-27 17:26:47 +09:00
Mike Place
d7a64db118 Merge pull request #37170 from fake-name/develop 
Wait for more appropriate flags while deploying a VPS via the vultr cloud interface.
 2016-10-27 15:34:13 +09: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
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