Nicole Thomas
|
a9dc04fb7f
|
Lint: disable the unused-import check
|
2017-10-05 08:51:16 -04:00 |
|
nasenbaer13
|
995e9cb608
|
Merge branch 'develop' into boto_lc
|
2017-10-05 14:28:47 +02:00 |
|
Kunal Ajay Bajpai
|
b99fd0ad64
|
Create dirs if not exists
|
2017-10-05 16:28:27 +05:30 |
|
JerzyX Drozdz
|
6bac5dcf7a
|
Fixed lint error (additional space after coma)
|
2017-10-05 11:08:33 +02:00 |
|
JerzyX Drozdz
|
3e41cb3a9b
|
Added missing requisites to stateconf renderer
|
2017-10-05 09:08:08 +02:00 |
|
Sébastien Santoro
|
15b8b8a9f4
|
Fix typo in salt-cloud scaleway documentation
s/scalewa/scaleway
|
2017-10-04 23:23:00 +00: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 |
|
Erik Johnson
|
042e092ac8
|
Don't put unserializable dict.keys() into state return
Running ``list()`` on the dictionary produces the same list, and has the
benefit of not catastrophically failing on Python 3.
|
2017-10-04 12:01:14 -05: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 |
|
Vernon Cole
|
73947e3103
|
lint (again!) blank lines can have no spaces
|
2017-10-04 09:10:47 -06:00 |
|
Mike Place
|
7038248820
|
Merge pull request #43899 from gtmanfred/2017.7
enable tox for tests
|
2017-10-04 09:08:15 -06:00 |
|
Mike Place
|
a5abe33e1c
|
Merge pull request #43828 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
|
2017-10-04 07:10:12 -06:00 |
|
Nicole Thomas
|
2ab7549d48
|
Merge pull request #43884 from UtahDave/2016.11local
Update SaltConf banner per Rhett's request
|
2017-10-04 09:08:29 -04:00 |
|
Nasenbaer
|
0a9acba625
|
Add missing delete_on_termination passthrough. Adapt docs.
|
2017-10-04 12:51:49 +02:00 |
|
Vernon Cole
|
67a701de7c
|
lint PEP-8
|
2017-10-03 23:23:17 -06:00 |
|
Vernon Cole
|
83a3678cef
|
provide mocked unit tests
|
2017-10-03 17:24:05 -06:00 |
|
Daniel Wallace
|
51eca1a6bd
|
enable tox for tests
|
2017-10-03 17:01:19 -06:00 |
|
garethgreenaway
|
478dd6e65a
|
Merge branch 'develop' into unit-test-sdb
|
2017-10-03 14:12:28 -07: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 |
|
garethgreenaway
|
6057cb036e
|
Merge branch 'develop' into unit-test-sdb
|
2017-10-03 12:16:47 -07: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 |
|
garethgreenaway
|
e3b2857285
|
Merge branch '2016.11' into 2016.11local
|
2017-10-03 11:50:29 -07:00 |
|
garethgreenaway
|
ea6d5259b3
|
Merge branch 'develop' into unit-test-sdb
|
2017-10-03 10:52:14 -07:00 |
|
apapp
|
87d676f08a
|
add -n with netstat so we don't resolve
|
2017-10-03 13:32:30 -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 |
|
Joseph Hall
|
88f2c0ef97
|
Add doc for new requirement
|
2017-10-03 11:18:24 -06:00 |
|
Joseph Hall
|
223a1eea83
|
Fix object_to_dict in azure
|
2017-10-03 11:11:42 -06:00 |
|
garethgreenaway
|
046fcce6fb
|
Merge branch 'develop' into develop
|
2017-10-03 09:56:51 -07:00 |
|
Corvin Mcpherson
|
aebe76b6f8
|
Fix issue with using roster_defaults with flat or cloud rosters.
fixes #43449
fixes #43643
|
2017-10-03 12:56:44 -04:00 |
|
Nicole Thomas
|
4b882d4272
|
Merge pull request #43869 from terminalmage/issue43522
Only join cmd if it's not a string
|
2017-10-03 12:25:07 -04:00 |
|
Vernon Cole
|
7d5a121265
|
Skip unit tests under Python3 until loader is fixed
|
2017-10-03 10:22:18 -06: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 |
|
garethgreenaway
|
6034b36bf6
|
Merge branch 'develop' into unit-test-sdb
|
2017-10-03 09:07:35 -07:00 |
|
David Boucha
|
8c671fd0c1
|
Update SaltConf banner per Rhett's request
|
2017-10-03 10:07:28 -06: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 |
|