Commit Graph

88403 Commits

Author SHA1 Message Date
Jorge Schrauwen
40f3a6f053
Merge branch 'develop' into issue44404 2017-12-06 20:25:14 +01:00
Nicole Thomas
f7a0979449
Merge pull request #43969 from fishhead108/add-cloud.vmware.remove_snapshot-feature
Remove snapshot by name feature
2017-12-06 13:08:14 -05:00
Nicole Thomas
8c34fb1178
Merge pull request #44642 from cloudflare/source-ip-port-opts
Adding options to be able to connect the Minion using a certain source IP / port
2017-12-06 12:45:39 -05:00
Nicole Thomas
6789bbcff0
Merge pull request #44679 from tonybaloney/more_napalm_tests
Unit test suite for napalm
2017-12-06 12:35:10 -05:00
Nicole Thomas
74d5ca13f5
Merge pull request #44826 from dfritsch/fix-gem-source-adding-in-test
Update the comment when in test mode for gem source adding
2017-12-06 11:48:22 -05:00
Nicole Thomas
60f834bdf2
Merge pull request #44702 from slaws/add-vault-approle
Add approle support to vault module
2017-12-06 11:47:03 -05:00
Nicole Thomas
0aa7abba20
Merge pull request #44626 from rongzeng54/master
- fix "ValueError: too many values to unpack" bug
2017-12-06 11:45:25 -05:00
Jorge Schrauwen
6324339fc6
Merge branch 'develop' into issue44404 2017-12-06 17:23:21 +01:00
Nicole Thomas
4bc1771fe9
Merge pull request #44835 from terminalmage/issue44829
Allow older minions to request master_tops
2017-12-06 10:43:18 -05:00
Nicole Thomas
584da96843
Merge pull request #44845 from cmclaughlin/runner-saltutil-docs
Adding link to salt.modules.saltutil on salt.runners.saltutil
2017-12-06 10:41:34 -05:00
Nicole Thomas
5499153f7b
Merge pull request #44841 from akashayi/neutron_shade
versionadded comment fix from Nitrogen to Oxygen
2017-12-06 10:28:48 -05:00
Mircea Ulinic
c843914045
Merge branch 'develop' into source-ip-port-opts 2017-12-06 14:46:44 +00:00
Anthony Shaw
2e930f7442
use arg tuples in the NetYANG state module to call the execution module 2017-12-06 15:19:48 +11:00
Anthony Shaw
4bd448a0f1
Merge branch 'more_napalm_tests' of github.com:tonybaloney/salt into more_napalm_tests 2017-12-06 15:14:49 +11:00
Anthony Shaw
6231d69f85
Merge remote-tracking branch 'origin/develop' into more_napalm_tests 2017-12-06 15:12:35 +11:00
Charles McLaughlin
65f4c7a9c4 Adding link to salt.modules.saltutil on salt.runners.saltutil
Just clarifying for anyone who ends up on the salt.runners.saltutil
page trying to sync a minion.
2017-12-05 15:55:49 -08:00
Nicole Thomas
e25f4c1aa9
Merge pull request #44450 from diepes/develop
mongodb_user.py catch error return in users and display error.
2017-12-05 18:11:35 -05:00
Nicole Thomas
45573a1fdf
Merge pull request #44627 from mstagi/add-vmware-vm-management
Add vmware vm management
2017-12-05 18:07:03 -05:00
Nicole Thomas
4bca5260dd
Merge branch 'develop' into fix-gem-source-adding-in-test 2017-12-05 17:53:01 -05:00
Nicole Thomas
48fbfd6e7a
Merge pull request #44814 from sypets/documentation-exec-modules
documentation: use term 'execution modules' instead of just 'modules'…
2017-12-05 17:49:18 -05:00
Nicole Thomas
4178fec7af
Merge pull request #44802 from oarmstrong/issue-44546
Note in doc for s/file.exists that doesn't modify
2017-12-05 17:43:57 -05:00
Akasha Yi
f4cc6ed8f3
Comment change from Nitrogen to Oxygen 2017-12-05 14:40:40 -08:00
Nicole Thomas
8fc09a4e6c
Merge pull request #44776 from akashayi/neutron_shade
Add new neutron module and states based on shade
2017-12-05 17:32:52 -05:00
Nicole Thomas
af23faa528
Merge pull request #44761 from bbczeuz/bbczeuz-patch-phusion-initd
Add phusion container initd detection
2017-12-05 17:31:00 -05:00
Nicole Thomas
d69cec9183
Merge branch 'develop' into add-vault-approle 2017-12-05 17:25:51 -05:00
Nicole Thomas
e37f654d0c
Merge branch 'develop' into more_napalm_tests 2017-12-05 16:56:59 -05:00
Nicole Thomas
1a7571372d
Merge pull request #44817 from SamYaple/glance_shade
Add new glance module and states based on shade
2017-12-05 16:37:27 -05:00
Nicole Thomas
8569287ecb
Merge pull request #44834 from BadgerOps/bugfix/fix_saltify_docs
fixed saltify documentation to refer to 'driver' instead of 'provider…
2017-12-05 16:36:07 -05:00
Jorge Schrauwen
9974adde11
Merge branch 'develop' into issue44404 2017-12-05 21:53:45 +01:00
Nicole Thomas
849b026762
Merge branch 'develop' into master 2017-12-05 15:46:42 -05:00
Nicole Thomas
a8a00e7476
Merge pull request #44611 from badriance/saltcloud-vmware-nested-folders
Allow VMWare profiles to set nested folders by use of / character
2017-12-05 15:43:20 -05:00
Nicole Thomas
b5b915435c
Merge branch 'develop' into develop 2017-12-05 15:25:09 -05:00
Jorge Schrauwen
18272955ee
Merge branch 'develop' into issue44404 2017-12-05 21:11:09 +01:00
Nicole Thomas
59dc7cd96f
Merge pull request #43980 from fishhead108/add-cloud.vmware.convert_to_snapshot-feature
Add convert_to_template feature for cloud.vmware
2017-12-05 14:59:28 -05:00
Nicole Thomas
47f850d6ba
Merge branch 'develop' into add-cloud.vmware.remove_snapshot-feature 2017-12-05 14:57:37 -05:00
Nicole Thomas
b946ad3384
Merge pull request #43710 from amendlik/gpg-yaml-sdb
Add GPG support to YAML SDB module
2017-12-05 14:42:41 -05:00
David Fritsch
7749c3fd6a
Merge branch 'develop' into fix-gem-source-adding-in-test 2017-12-05 12:59:50 -06:00
Akasha Yi
83603fa8c5
Removing salt.utils 2017-12-05 10:55:35 -08:00
Erik Johnson
9865a31e62
Allow older minions to request master_tops 2017-12-05 11:56:31 -06:00
Nicole Thomas
f967a54dc2
Merge branch 'develop' into bbczeuz-patch-phusion-initd 2017-12-05 12:47:40 -05:00
BadgerOps
efc86b0eba fixed saltify documentation to refer to 'driver' instead of 'provider' in provider example 2017-12-05 10:38:53 -07:00
Sam Yaple
43c68047c5
Remove salt.utils 2017-12-05 12:21:17 -05:00
Sam Yaple
f97c07c5ef
Update version added to Oxygen
Addtionally adjust to the new way to call clean_kwargs
2017-12-05 12:19:29 -05:00
Sam Yaple
667590140b
Add new glance module and states based on shade 2017-12-05 12:19:24 -05:00
Nicole Thomas
1463e036d7
Merge pull request #44751 from terminalmage/issue43204
Include failed state/function orchestration results in changes dict
2017-12-05 09:04:30 -05:00
Erik Johnson
ecd0a6a016
Add link to newly-merged docs section 2017-12-05 00:57:14 -06:00
Erik Johnson
abed8e5952
Add documentation / release notes 2017-12-05 00:57:14 -06:00
Erik Johnson
ee3486a671
Include failed state/function orchestration results in changes dict
Before this commit they would be in the comment, making it difficult to
programatically analyze the failures.
2017-12-05 00:56:05 -06:00
Adam Mendlik
de5cdde2c1
Fix failing tests for YAML SDB module 2017-12-04 17:42:04 -07:00
Adam Mendlik
5980860f06
Fix lint error in sdb/__init__.py 2017-12-04 17:41:52 -07:00