Commit Graph

86602 Commits

Author SHA1 Message Date
John Kristensen
b7edddd215 Document key_text option in pkgrepo state
The `key_text` option was added a while back but the documentation for
it was not included. It would be a good idea to have all options
documented properly.
2017-10-06 12:22:50 +11:00
John Kristensen
0cf411671e Check the key_text option doesn't conflict with any other options
There are checks for `key_url` and `keyid`/`keyserver`, so we should
probably also have a check for `key_text` as well.
2017-10-06 12:20:18 +11:00
Nicole Thomas
3468e9c38f Merge pull request #43866 from mahesh21/develop
Fix TypeError: 'NoneType' object is not iterable for list_networks function
2017-10-03 16:55:36 -04:00
Nicole Thomas
484220e177 Merge pull request #43870 from basepi/azurefs
[bugfix] Add hash cache invalidation to azurefs
2017-10-03 15:03:27 -04:00
Nicole Thomas
820a542a8d Merge pull request #43882 from kunal-bajpai/fix_couchbase_returner
Handle possible KeyError in couchbase.get_load
2017-10-03 15:01:26 -04:00
Nicole Thomas
a6483b1b39 Merge pull request #43841 from bloomberg/update-netstat
add -n with netstat so we don't resolve IPs
2017-10-03 13:28:31 -04:00
Nicole Thomas
607f9b95d5 Merge branch 'develop' into develop 2017-10-03 13:25:41 -04:00
Mike Place
667bd38a69 Merge branch 'develop' into fix_couchbase_returner 2017-10-03 09:50:40 -06:00
Mike Place
cbf7acc44d Merge pull request #43834 from alexbleotu/tests-gh
Additional tests for functions in salt.modules.vsphere & salt.utils.vsan
2017-10-03 09:39:18 -06:00
Mike Place
aeea10f2b9 Merge branch 'develop' into azurefs 2017-10-03 09:09:35 -06:00
Kunal Ajay Bajpai
73fd7d91cc Handle possible KeyError in couchbase.get_load 2017-10-03 18:48:03 +05:30
mahesh21
b3e9b70829 Merge branch 'develop' into develop 2017-10-02 18:03:27 -04:00
Nicole Thomas
38dbd55412 Merge pull request #43860 from eyj/jid_queue
Activate jid_queue also for SingleMinions (occurs on reconnect)
2017-10-02 16:52:00 -04:00
mahesh21
71793e4440 Merge branch 'develop' into develop 2017-10-02 15:46:54 -04:00
Colton Myers
2fa7fe5ee5
Add hash cache invalidation to azurefs 2017-10-02 13:46:36 -06:00
Nicole Thomas
8a1ae5c465 Merge pull request #43862 from dwiest/patch-1
Fixed Jinja typo in faq.rst
2017-10-02 15:40:09 -04:00
Mahesh Balumuri
bd3d457903
Fix TypeError: 'NoneType' object is not iterable during list_networks function. 2017-10-02 14:13:40 -04:00
Damian Wiest
76cd070e2d Fixed Jinja typo in faq.rst
A closing curly brace was missing in the first block of Jinja code under the "Restart using states" section.
2017-10-02 10:15:02 -05:00
Mike Place
df9317ed39 Merge pull request #43836 from rallytime/stale-config-update
Reduce the number of days an issue is stale by 25
2017-10-02 16:53:05 +02:00
Mike Place
638aa96aff Merge pull request #43852 from amalleo25/patch-2
Update joyent.py
2017-10-02 16:34:22 +02:00
Nasenbaer
325a2f301e Activate jid_queue also for SingleMinions to workaround 0mq reconnection issues 2017-10-02 11:51:44 +02:00
amalleo25
d4551ab63f Update joyent.py
Location parameter defined in the cloud provider config was ignored in the list_nodes function. This caused an issue when querying a node after creation.
2017-10-01 21:06:11 -04:00
Nicole Thomas
9f25a1c2dd Merge pull request #43503 from The-Loeki/high-out-by_id
Additional highstate output modes; changes_id, filter_id, terse_id, full_id
2017-10-01 10:14:26 -04:00
Nicole Thomas
8cf38f4065 Merge pull request #42820 from cenkalti/fix-cmd_iter
Yield timed out minions from LocalClient.cmd_iter
2017-10-01 10:08:23 -04:00
Alexandru Bleotu
3c6418b98f pylint 2017-09-29 19:45:56 -04:00
apapp
0878dbd0e8 add -n with netstat so we don't resolve 2017-09-29 15:03:56 -04:00
rallytime
e0d3028bb0
Reduce the number of days an issue is stale by 25 2017-09-29 14:25:18 -04:00
Alexandru Bleotu
0c6a49ba38 Added tests for salt.utils.vsan.remove_diskgroup 2017-09-29 13:39:59 -04:00
Alexandru Bleotu
9de868fdfb Added tests for salt.utils.vsan.remove_capacity_from_diskgroup 2017-09-29 13:39:57 -04:00
Alexandru Bleotu
32d44142f2 Added tests for salt.utils.vsan.add_capacity_to_diskgroup 2017-09-29 13:39:54 -04:00
Alexandru Bleotu
d813164d18 Added tests for salt.utils.vsan.create_diskgroup 2017-09-29 13:39:52 -04:00
Alexandru Bleotu
523a2ac21d Added tests for salt.utils.vsan.get_host_vsan_system 2017-09-29 13:39:49 -04:00
Alexandru Bleotu
dac9522814 Added tests for salt.utils.vsan.get_vsan_disk_management_system 2017-09-29 13:39:47 -04:00
Alexandru Bleotu
b4a05dc7c0 Added tests for salt.modules.vsphere.remove_capacity_from_diskgroup 2017-09-29 13:39:44 -04:00
Alexandru Bleotu
ec2637db44 Added tests for salt.modules.vsphere.remove_diskgroup 2017-09-29 13:39:41 -04:00
Alexandru Bleotu
4e0755de20 Added tests for salt.modules.vsphere.remove_datastore 2017-09-29 13:39:39 -04:00
Alexandru Bleotu
51703a8a34 Added tests for salt.modules.vsphere.erase_disk_partitions 2017-09-29 13:39:36 -04:00
Alexandru Bleotu
dbe363700a Fixes to several functions in modules.vsphere 2017-09-29 13:39:34 -04:00
Mike Place
2ebc07ba99 Merge pull request #43758 from sdodsley/trailinglinefix
Fix trailing newline on grains
2017-09-29 12:15:29 +02:00
Mike Place
6523ea1b69 Merge pull request #43714 from syf-zsxm/wip-delete-key
Catch OSError/IOError when check minion cache
2017-09-29 12:13:31 +02:00
Mike Place
2f3f4705bd Merge pull request #43791 from alexbleotu/extra_minion_data_in_pillar-gh
External pillar that includes extra minion data in the minion pillar
2017-09-29 12:02:06 +02:00
Mike Place
84f8231a5d Merge pull request #43793 from rallytime/release-note-formatting
Fix some formatting issues on the oxygen release notes page
2017-09-29 12:00:13 +02:00
Mike Place
2986e301cc Merge pull request #43794 from rallytime/panos-module-fixes
Fixup a couple of issues with the panos execution module
2017-09-29 11:45:37 +02:00
garethgreenaway
fc7a69313b Merge branch 'develop' into panos-module-fixes 2017-09-28 19:49:40 -07:00
garethgreenaway
61280cc0c3 Merge branch 'develop' into release-note-formatting 2017-09-28 19:49:12 -07:00
申艳芬
8f58f7b8ab bugfix: Catch OSError/IOError when check minion cache
Signed-off-by: 申艳芬 <SYF@shenyanfens-MacBook-Pro.local>
2017-09-29 08:38:08 +08:00
Simon Dodsley
676c18481f
Fix trailing newline on grains
The grains iscsi_iqn and fc_wwn have training newlines which cause
show when calling the grain from a state file and trying to pass
this to an execution module.

Remove the training newline with rstrip()
2017-09-28 14:50:08 -07:00
Nicole Thomas
63821381a0 Merge pull request #39670 from smarsching/feature-parallel-runners
Added the saltmod.parallel_runners state.
2017-09-28 17:30:08 -04:00
Nicole Thomas
15b46846fc Merge pull request #41233 from dnABic/fix/rabbitmq_policy
added parameter apply_to for rabbitmq policy
2017-09-28 15:03:42 -04:00
Nicole Thomas
a7775c7ca3 Merge pull request #43795 from sdodsley/releasenotes
Update Oxygen Release notes with new grains and module
2017-09-28 13:37:08 -04:00