Nicole Thomas
49ce325db8
Merge branch 'develop' into fix-no-content-response-from-v2-hipchat
2017-12-06 12:37:12 -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
Ahmed AbouZaid
2c51005810
write unit test for defaults.deepcopy
2017-12-06 16:57:55 +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
Nicole Thomas
d20b3e458a
Merge branch 'develop' into issue30842
2017-12-06 09:28:06 -05:00
Ahmed AbouZaid
de3651b8a7
expose deepcopy function
2017-12-06 12:56:39 +01:00
Sjuul Janssen
b440e733d6
Merge branch 'develop' into alternate_composefile
2017-12-06 08:45:15 +01:00
sjuul
106846518b
Merge branch 'alternate_composefile' of github.com:obeleh/salt into alternate_composefile
2017-12-06 08:43:55 +01:00
sjuul
f7e662d668
fixes for pylint
2017-12-06 08:43:15 +01: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
Tom Williams
ef414cb2f2
INFRA-5980 - fix other unit test :)
2017-12-05 17:24:25 -05:00
Erik Johnson
01a76919cb
Add hide_output option to cmd state/exec module
...
We have `output_loglevel` for controlling logging, but no corresponding
option to suppress the output from the command from being returned. This
adds a `hide_output` option to do that.
Additionally, this removes the rest of the references to the
long-since-deprecated `quiet` argument from the cmd execution module,
and adds a warning to states which use this argument. `quiet` appears to
have been incompletely removed following its deprecation. It was not
being passed to _check_loglevel(), so it was essentially ignored, but it
was still being accepted as an argument by several functions. Those
references to what has for some time now been a no-op argument are now
removed.
2017-12-05 16:10:02 -06:00
Nicole Thomas
e37f654d0c
Merge branch 'develop' into more_napalm_tests
2017-12-05 16:56:59 -05:00
Nicole Thomas
ea3f1a4d38
Merge branch 'develop' into develop
2017-12-05 16:56:09 -05:00
Nicole Thomas
0298f99d81
Merge branch 'develop' into 44606_glusterfs_peered_self_detection
2017-12-05 16:55:15 -05:00
Jesse Bye
1224cf2f20
Merge branch 'develop' into 2017.7.2_rds_create_tags_bugfix
2017-12-05 13:54:43 -08:00
Jesse Bye
fb3a677fdb
corrects a bug with passing tags to boto_rds module
2017-12-05 13:47:11 -08: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
Nicole Thomas
49464dc755
Merge branch 'develop' into fixpip
2017-12-05 16:04:36 -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
Thomas S Hatch
d93669747a
Extend the pause system to allow for kill
...
Also clean up some copy pasta and add state.get_pauses function
allong with state.soft_kill function
2017-12-05 13:00:29 -07: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
b0008b8ec3
Merge branch 'develop' into sentry_return
2017-12-05 14:48:58 -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
