Nicole Thomas
7785919437
Merge pull request #43829 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-10-05 16:09:23 -04:00
Nicole Thomas
49202d71e2
Merge pull request #43911 from eradman/vsphere_tests
...
Skip some vsphere tests if pyvmomi library is not installed
2017-10-05 14:58:31 -04:00
Nicole Thomas
4a942b75e9
Merge pull request #43878 from netzmacher/develop
...
Bugfix: runners/survey.py Python3 support
2017-10-05 14:52:09 -04:00
Bike Dude
7f004adca1
survey runner bugfix
2017-10-05 19:02:55 +02:00
Nicole Thomas
865bf0fa9b
Merge pull request #43907 from richardsimko/develop
...
Make sure EBS volume exists before querying
2017-10-05 08:59:11 -04:00
Nicole Thomas
b25df9106b
Merge pull request #43894 from techhat/azurerg
...
Show all nodes if no resource_group specified
2017-10-05 08:56:11 -04:00
Nicole Thomas
a9dc04fb7f
Lint: disable the unused-import check
2017-10-05 08:51:16 -04:00
Bike Dude
f7fc4a3754
Merge branch 'develop' of https://github.com/netzmacher/salt into develop
2017-10-04 20:56:02 +02:00
Bike Dude
ae03b70b19
survey runner bugfix
2017-10-04 20:55:38 +02:00
Sven R
d29218e043
Merge branch 'develop' into develop
2017-10-04 20:52:21 +02:00
Bike Dude
2dbee2b0fc
survey runner bugfix
2017-10-04 20:50:03 +02:00
Eric Radman
0dc3c4ef1c
Skip some vsphere tests if pyvmomi library is not installed
...
Also fix up 'E127: continuation line over-indented' lint errors
2017-10-04 13:09:29 -04:00
Richard Simko
9730c5da17
Make sure volume exists before querying
2017-10-04 18:00:54 +02:00
Nicole Thomas
01a0ea8a61
Merge pull request #43864 from gtmanfred/develop
...
use .get incase attrs are disabled on the filesystem
2017-10-04 11:37:14 -04: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
Daniel Wallace
eb599307fc
Merge branch 'develop' into develop
2017-10-03 14:31:50 -06:00
Joseph Hall
916ce3d006
Show all nodes if no resource_group specified
2017-10-03 13:37:26 -06: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
garethgreenaway
bf44919d39
Merge branch 'develop' into develop
2017-10-03 11:54:04 -07: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
garethgreenaway
046fcce6fb
Merge branch 'develop' into develop
2017-10-03 09:56:51 -07:00
rallytime
b7dae5addd
Bump with statements in one level
...
This is needed because the previous commit changed the context
management style from nested with statements to stacked with
statements.
2017-10-03 12:18:27 -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
Bike Dude
d28aa20c74
survey runner bugfix
2017-10-03 12:08:34 +02:00
Bike Dude
b6723030f8
Merge branch 'develop' of https://github.com/netzmacher/salt into develop
2017-10-03 12:07:46 +02:00
Bike Dude
ab7ca0c3a8
Merge pull request #43860 from eyj/jid_queue
...
Activate jid_queue also for SingleMinions (occurs on reconnect)
2017-10-03 12:07:03 +02:00
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
Daniel Wallace
dee0d318c1
use .get incase attrs are disabled on the filesystem
2017-10-02 11:16:04 -06: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
rallytime
c976df7c09
Fix mocking in test_status since the "which" util has moved
2017-09-29 13:56:01 -04:00
Alexandru Bleotu
0c6a49ba38
Added tests for salt.utils.vsan.remove_diskgroup
2017-09-29 13:39:59 -04:00
