Vernon Cole
05392bc664
cloud friendly vagrant destroy
...
(cherry picked from commit e82b1dc)
2017-10-02 22:10:05 -06:00
Vernon Cole
f96740d278
use recommended source for TMP directory
2017-10-02 21:07:27 -06:00
mahesh21
b3e9b70829
Merge branch 'develop' into develop
2017-10-02 18:03:27 -04:00
Eric Radman
1a9f12fd67
Detect OpenBSD guest running under VMM(4)
...
grains.manufacturer is 'OpenBSD' when running under VMM
2017-10-02 17:45:37 -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
Vernon Cole
2bccf228ba
fix code-lint complaint
2017-10-02 12:18:11 -06: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
garethgreenaway
aef2b180ee
Merge branch 'develop' into unit-test-sdb
2017-10-02 10:11:21 -07:00
garethgreenaway
6c20e146c3
Lint Fixes
...
Lint Fixes
2017-10-02 10:10:53 -07:00
Vernon Cole
22792e56cc
lint, style, and Windows fixes
2017-10-02 09:48:27 -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
08463ba153
Merge branch 'develop' into bugs/43003_group_syndic_develop
2017-10-01 10:11:11 -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
Ken Koch
c208f0ac39
Merge branch 'develop' into develop
2017-10-01 08:17:43 -04:00
Ken Koch
2beeb39302
Merge branch 'develop' of github.com:kkoch986/salt into develop
2017-10-01 07:53:22 -04:00
Ken Koch
57a624d86b
Add support for tagging newly created DigitalOcean droplets.
...
Signed-off-by: Ken Koch <kkoch986@gmail.com>
2017-10-01 07:53:07 -04:00
Ken Koch
06eb9c30dd
Add support for tagging newly created DigitalOcean droplets.
2017-10-01 07:32:33 -04:00
Alexandru Bleotu
3c6418b98f
pylint
2017-09-29 19:45:56 -04:00
Vernon Cole
18357ac59d
provide a unit test for the sdb utility
2017-09-29 13:58:13 -06: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
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
Dmitry Kuzmenko
f8c428f034
Merge branch 'develop' into bugs/43003_group_syndic_develop
2017-09-29 19:30:43 +03:00
rallytime
a38ceab7cf
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/cli/batch.py
- salt/master.py
- salt/utils/path.py
- tests/unit/modules/test_state.py
2017-09-29 11:48:33 -04:00
Mike Place
952b5d8e87
Merge branch 'develop' into vagrant-module
2017-09-29 12:34:41 +02: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
c6fd2cd452
Merge pull request #43801 from terminalmage/issue43553
...
Properly handle UNC paths in salt.utils.path.readlink()
2017-09-29 11:58:01 +02:00
