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
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
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
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
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
