Nicole Thomas
f66eb1c5ad
Merge pull request #43588 from gtmanfred/do
...
digitalocean should be one word.
2017-09-21 09:25:38 -04:00
Daniel Wallace
2f3be5785b
there were more
2017-09-20 15:55:37 -06:00
Daniel Wallace
f54ddae6bb
fix do test where space was seperated by a newline
2017-09-20 09:57:57 -06:00
Mike Place
56a8257558
Merge branch 'develop' into fix-nacl-decrypt
2017-09-19 18:15:43 -06:00
Mike Place
5531e2f738
Merge pull request #43489 from garethgreenaway/41510_mount_opts
...
Fix to mount state when options are removed
2017-09-19 18:10:47 -06:00
Daniel Wallace
3bae894306
digitalocean should be one word.
...
Everything on their webpage is a reference to DigitalOcean
2017-09-19 12:47:16 -06:00
Petr Michalec
ad05cc5d98
Fix names of NACL dec. methods
2017-09-19 15:46:12 +02:00
Alexandru Bleotu
55e0092519
Merge branch 'develop' into list_cluster-gh
2017-09-16 18:00:18 +01:00
garethgreenaway
e870ca1ef4
Merge branch 'develop' into 41510_mount_opts
2017-09-15 16:19:09 -07:00
Nicole Thomas
9a66d5cebc
Merge pull request #43495 from rallytime/move_arg_utils
...
Move 2 arg-related utility functions into salt.utils.args.py
2017-09-15 17:29:10 -04:00
garethgreenaway
2c091ecaae
Merge branch 'develop' into 41510_mount_opts
2017-09-15 12:44:31 -07:00
Alexandru Bleotu
d9b5424aab
Merge branch 'develop' into list_cluster-gh
2017-09-15 20:04:33 +01:00
Mike Place
a1b871304b
Merge pull request #43345 from ribx/develop
...
better atom extraction from portage version string
2017-09-15 12:29:25 -06:00
Mike Place
b262695301
Merge pull request #43493 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-09-15 12:23:09 -06:00
garethgreenaway
787f141504
Merge branch 'develop' into 41510_mount_opts
2017-09-15 08:43:06 -07:00
Alexandru Bleotu
4421744882
pylint on own code
2017-09-14 16:22:31 -04:00
Erik Johnson
792cc0eb54
Merge pull request #43203 from rallytime/fix-21969
...
Return a SaltInvocationError when passing incorrect function pattern for wheel/runner functions.
2017-09-14 12:17:48 -05:00
Alexandru Bleotu
d9d78fa35c
Added missing decorators in utils.vmware tests
2017-09-14 12:47:55 -04:00
Alexandru Bleotu
caf9a0578b
Added tests for utils.vmware.get_service_info
2017-09-14 12:47:53 -04:00
Alexandru Bleotu
2c3b4434f8
Added tests for utils.vsan.get_cluster_vsan_info
2017-09-14 12:47:48 -04:00
Alexandru Bleotu
e811eb9c85
Added tests for utils.vsan.get_vsan_cluster_config_system
2017-09-14 12:47:44 -04:00
Alexandru Bleotu
a2f84e6f39
Added tests for utils.vsan.vsan_supported
2017-09-14 12:47:41 -04:00
Alexandru Bleotu
c3d6af502b
Added tests for modules.vsphere.list_cluster
2017-09-14 12:47:34 -04:00
rallytime
75abf0a2a9
Test fix: update mock util path
2017-09-14 11:01:06 -04:00
Alexandru Bleotu
15a2499d27
Added tests for salt.vsphere._get_proxy_target
2017-09-14 10:52:28 -04:00
Nicole Thomas
aee52a20e0
Lint: Add empty line at end of file
2017-09-14 09:48:09 -04:00
Robin Lutz
e1428dec5f
corrected some PEP8 problems reported by jenkins
2017-09-14 14:24:54 +02:00
rallytime
acb98bbce2
Move salt.utils.argspec_report to salt.utils.args.py
2017-09-13 18:12:52 -04:00
rallytime
9df868930a
Move salt.utils.arg_lookup to salt.utils.args.py
2017-09-13 17:37:49 -04:00
Nicole Thomas
f8ef7dce40
Merge pull request #43469 from alexbleotu/test_fixes-gh
...
Fixed several tests
2017-09-13 15:53:53 -04:00
rallytime
bfcfcd75e8
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/fileclient.py
- salt/loader.py
- salt/minion.py
- salt/modules/alternatives.py
- salt/modules/genesis.py
- tests/unit/modules/test_hosts.py
- tests/unit/modules/test_ini_manage.py
2017-09-13 15:15:04 -04:00
garethgreenaway
892d459f01
Merge branch 'develop' into 41510_mount_opts
2017-09-13 12:01:42 -07:00
Nicole Thomas
d2b13ce4c0
Merge pull request #43468 from terminalmage/git-configparser
...
Fix unicode handling on PR #43378
2017-09-13 13:57:17 -04:00
Gareth J. Greenaway
132b56d785
Updating mount to allow opts in the state file to be removed and have the volume remounted
2017-09-13 10:30:15 -07:00
Alexandru Bleotu
bf3785739e
Fixed failing config.test_api tests for when the ROOT_DIR is /
2017-09-13 13:01:15 -04:00
Alexandru Bleotu
449dccdaa1
pylint
2017-09-13 05:13:01 -04:00
Alexandru Bleotu
0222a5a056
Fix to vsphere tests
2017-09-12 18:43:08 -04:00
Alexandru Bleotu
afa4921d37
Fixed vsphere tests to support the esxcluster proxy
2017-09-12 18:43:05 -04:00
Alexandru Bleotu
26710fa8fc
Added tests for esxcluster execution module
2017-09-12 18:42:58 -04:00
Alexandru Bleotu
4113aa3ca7
Added tests for esxcluster proxy
2017-09-12 18:42:53 -04:00
Alexandru Bleotu
71c5725008
Merge branch 'develop' into test_fixes-gh
2017-09-12 23:31:37 +01:00
Alexandru Bleotu
f11a618274
Fixed Linux sysctl tests to be run in a local environment
2017-09-12 18:27:28 -04:00
Alexandru Bleotu
5c3dd00692
Updated config.test_api tests to take into account a ROOT_DIR override
2017-09-12 18:27:26 -04:00
Alexandru Bleotu
4cadfdcb56
Updated kubernetes tests to be skipped if library is not loaded
2017-09-12 18:27:23 -04:00
Erik Johnson
575ce9eb73
Fix unicode handling on PR 43378
...
The strings passed to exceptions should not be unicode types, as this
can cause problems elsewhere when exception class instances are
referenced.
2017-09-12 16:37:15 -05:00
Nicole Thomas
1016f585f5
Merge pull request #43378 from terminalmage/git-configparser
...
Add a GitConfigParser class for manipulating git config files
2017-09-12 17:10:43 -04:00
Mike Place
68d2558988
Merge pull request #43096 from lyft/add-util-func-for-state-return-merging
...
Add utils function to merge state returns
2017-09-12 11:02:14 -06:00
Mike Place
87ffd3f105
Merge pull request #42103 from davidjoliver86/ssh-config-roster
...
ssh config roster for salt-ssh
2017-09-12 10:38:49 -06:00
Erik Johnson
626129f5a3
Import all of configparser into module for easier access to error classes
2017-09-12 11:37:13 -05:00
Erik Johnson
507c1b871e
Add a GitConfigParser class for manipulating git config files
...
This class is designed to be used for (among other things) gitfs and git_pillar, to enforce config settings which reside in a git config file without resorting to using the git CLI.
2017-09-12 11:37:13 -05:00
