garethgreenaway
|
76ff44bc84
|
Merge branch 'develop' into vagrant-module
|
2017-10-09 09:06:42 -07:00 |
|
garethgreenaway
|
1ff27a4b2b
|
Merge pull request #43842 from vernondcole/unit-test-sdb
provide a unit test for the sdb utility
|
2017-10-09 08:00:23 -07:00 |
|
Daniel Wallace
|
1f8ec5d335
|
Merge branch 'develop' into vagrant-module
|
2017-10-06 11:32:31 -06:00 |
|
garethgreenaway
|
11c7d3ab39
|
Merge branch 'develop' into unit-test-sdb
|
2017-10-06 07:28:42 -07:00 |
|
Nicole Thomas
|
d136650b31
|
Merge pull request #43938 from terminalmage/salt.utils.user
Move several functions from salt.utils to salt.utils.user
|
2017-10-06 09:42:42 -04:00 |
|
Erik Johnson
|
aa3309ef59
|
Move several functions from salt.utils to salt.utils.user
These functions are as follows:
- salt.utils.get_user
- salt.utils.get_uid
- salt.utils.get_specific_user
- salt.utils.chugid
- salt.utils.chugid_and_umask
- salt.utils.get_default_group
- salt.utils.get_group_list
- salt.utils.get_group_dict
- salt.utils.get_gid_list
- salt.utils.get_gid
|
2017-10-05 19:50:14 -05:00 |
|
garethgreenaway
|
bd9f5d73fb
|
Merge branch 'develop' into unit-test-sdb
|
2017-10-05 16:12:48 -07:00 |
|
Nicole Thomas
|
ac23b5cfe7
|
Merge pull request #43859 from eyj/boto_lc
Add missing delete_on_termination passthrough. Adapt docs.
|
2017-10-05 19:11:16 -04:00 |
|
garethgreenaway
|
53509e8d46
|
Merge branch 'develop' into unit-test-sdb
|
2017-10-05 15:35:13 -07:00 |
|
nasenbaer13
|
3d7340b371
|
Merge branch 'develop' into boto_lc
|
2017-10-05 22:42:56 +02:00 |
|
Nasenbaer
|
7d66ab9ac1
|
Merge remote-tracking branch 'origin/boto_lc' into boto_lc
|
2017-10-05 22:42:39 +02:00 |
|
Nasenbaer
|
7d3ece7a32
|
Adapted documentation of delete_on_termination parameter
|
2017-10-05 22:42:22 +02:00 |
|
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 |
|
garethgreenaway
|
4c5af8cc96
|
Merge branch 'develop' into unit-test-sdb
|
2017-10-05 13:01:01 -07: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 |
|
garethgreenaway
|
9a0773542d
|
Merge branch 'develop' into unit-test-sdb
|
2017-10-05 10:30:37 -07:00 |
|
garethgreenaway
|
37d7f13926
|
Merge branch 'develop' into vagrant-module
|
2017-10-05 10:25:24 -07: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 |
|
nasenbaer13
|
995e9cb608
|
Merge branch 'develop' into boto_lc
|
2017-10-05 14:28:47 +02: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 |
|
Vernon Cole
|
73947e3103
|
lint (again!) blank lines can have no spaces
|
2017-10-04 09:10:47 -06: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 |
|
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
|
ea6d5259b3
|
Merge branch 'develop' into unit-test-sdb
|
2017-10-03 10:52:14 -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 |
|
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 |
|
Mike Place
|
667bd38a69
|
Merge branch 'develop' into fix_couchbase_returner
|
2017-10-03 09:50:40 -06:00 |
|