Nicole Thomas
36bc4ac912
Merge pull request #43462 from rdutch/beacon_state_fix
...
Added save argument to Beacon state module
2017-09-13 18:33:32 -04: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
rallytime
82feaea913
Move salt.utils.xor to salt.utils.value
2017-09-13 16:49:16 -04:00
rallytime
6e7149cd71
Move salt.utils.human_to_bytes to salt.utils.stringutils
2017-09-13 16:30:52 -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
Nicole Thomas
395f079daf
Merge branch 'develop' into modules-ssh-add-newline-fix
2017-09-13 15:51:48 -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
rdutch
fd0b1ca9f9
Merge branch 'develop' into beacon_state_fix
2017-09-13 13:48:20 -05:00
Hilberding, Rob
810899d413
Simplified if statement
2017-09-13 13:44:05 -05:00
3add3287
999deacb0a
Fix indentation from tabs to spaces
2017-09-13 20:38:39 +02:00
Nicole Thomas
c3d9e2d9b2
Merge pull request #43431 from mattLLVW/fix-hosts-deb
...
Fix /etc/hosts not being modified when hostname is changed
2017-09-13 14:35:54 -04:00
Nicole Thomas
75e8c181ec
Merge pull request #43485 from rallytime/linode-utils
...
Move "salt.utils" calls to __utils__ in linode driver
2017-09-13 14:31:21 -04:00
Hilberding, Rob
b71e7e673f
Made the requested changes
2017-09-13 13:19:12 -05: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
2459bafeb5
fixing merge conflicts
2017-09-13 10:43:02 -07:00
Gareth J. Greenaway
b2475b1c35
Adding a check in case the cache file is empty.
2017-09-13 10:30:16 -07:00
Gareth J. Greenaway
594c324beb
Updating unmounted state to ensure the cache is updated and mount is cleared out on unmount.
2017-09-13 10:30:16 -07:00
Gareth J. Greenaway
df571b90aa
adding utils/mount.py
2017-09-13 10:30:16 -07: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
Mike Place
4fc64fd5b9
Merge pull request #43465 from psagers/develop
...
acme.cert: avoid IOError on failure.
2017-09-13 10:52:15 -06:00
Mike Place
cebe28e217
Merge pull request #43466 from cachedout/cisc_oxygen_release_notes
...
Add information about cimc to release notes
2017-09-13 10:46:41 -06:00
Mike Place
9767e46ce4
Merge branch 'develop' into cisc_oxygen_release_notes
2017-09-13 10:45:24 -06:00
Mike Place
d2b790d883
Merge pull request #43471 from alexbleotu/esxcluster-gh
...
Esxcluster proxy minion and support in vsphere module
2017-09-13 10:11:22 -06:00
rallytime
ed8113dfe8
Move "salt.utils" calls to __utils__ in linode driver
2017-09-13 12:06:47 -04:00
3add3287
7c0f4b889c
Copy paste typo
2017-09-13 17:35:39 +02:00
Mike Place
014409e1b3
Merge pull request #43472 from V3XATI0N/patch-1
...
Make aptpkg work with Deepin Linux
2017-09-13 09:31:36 -06:00
Nicole Thomas
054c64a006
Merge pull request #43460 from cachedout/ssh_roster_notes
...
Add release note about ssh rosters
2017-09-13 11:30:52 -04:00
3add3287
c2c65b4ac2
Fix checking for newline on end of file by properly checking the last byte of the file if the file is non empty.
2017-09-13 17:10:42 +02:00
Alexandru Bleotu
59cb07269c
pylint
2017-09-13 05:17:06 -04:00
Alexandru Bleotu
449dccdaa1
pylint
2017-09-13 05:13:01 -04:00
V3XATI0N
1b877a6c60
Make aptpkg work with Deepin Linux
...
Simple change, but it bugs me having to add this every time I update. Also I never contribute so proposing this change here is probably the wrong place to do it. Sue me if you want I'm super broke.
2017-09-12 19:46:02 -07: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
b880956468
Added esxcluster to supported proxies
2017-09-12 18:43:03 -04:00
Alexandru Bleotu
91c22163b6
Added vsphere._get_esxcluster_proxy_details that retrieves a esxcluster proxy details
2017-09-12 18:43:00 -04:00
Alexandru Bleotu
26710fa8fc
Added tests for esxcluster execution module
2017-09-12 18:42:58 -04:00
Alexandru Bleotu
679e388632
Added esxcluster shim execution module
2017-09-12 18:42:55 -04:00
Alexandru Bleotu
4113aa3ca7
Added tests for esxcluster proxy
2017-09-12 18:42:53 -04:00
Alexandru Bleotu
0302948fff
Added esxcluster proxy used to manage ESX clusters
2017-09-12 18:42:51 -04:00
Alexandru Bleotu
ba515df631
Added esxcluster proxy input JSON schema
2017-09-12 18:42:48 -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
Mike Place
15ffecd4a7
Give the name of the roster
2017-09-12 15:44:26 -06: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
a09f289fbb
Merge pull request #43403 from twangboy/win_fix_redismod
...
Proper timestamp conversion in `redis.lastsave`
2017-09-12 17:18:06 -04:00
