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
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
Hilberding, Rob
6885c6b458
removed commented code
2017-09-12 16:00:24 -05:00
rdutch
af01412b8d
Merge branch 'develop' into beacon_state_fix
2017-09-12 15:50:10 -05:00
Mike Place
eba40686e8
Add information about cimc to release notes
2017-09-12 14:39:00 -06:00
Mike Place
8837865a06
Merge pull request #43459 from spenceation/cimc/initial
...
Added Cisco UCS Chassis proxy modules.
2017-09-12 14:37:29 -06:00
garethgreenaway
c6320b1dff
Merge branch '2017.7' into fix-hosts-deb
2017-09-12 13:32:01 -07:00
Mike Place
0eaa5acb72
Merge pull request #43463 from twangboy/win_norestart_2017.7
...
Add `/norestart` switch to vcredist installer
2017-09-12 14:29:26 -06:00
garethgreenaway
27503b2d53
Merge branch 'develop' into beacon_state_fix
2017-09-12 13:25:17 -07:00
Peter Sagerson
dc1768239d
acme.cert: avoid IOError on failure.
2017-09-12 13:17:20 -07:00
twangboy
6984b8fd60
Add /norestart to vcredist installer
2017-09-12 12:49:20 -06:00
Hilberding, Rob
8d1be29068
Added save argument and removed merge
2017-09-12 13:16:03 -05:00
Nicole Thomas
2fc237a806
Merge pull request #43443 from garethgreenaway/43386_2017_7_schedule_kwargs_pub
...
[2017.7] Fixes to scheduler __pub values in kwargs
2017-09-12 14:14:45 -04:00
Erik Johnson
6c3005eead
Manage git config using GitConfigParser insead of git CLI
2017-09-12 12:45:47 -05: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
27315c31c8
Add release note about ssh rosters
2017-09-12 10:41:06 -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
Mike Place
50720846a6
Merge pull request #42756 from terminal-labs/develop
...
Adding fingerprint_hash_type to known host example.
2017-09-12 10:30:26 -06:00
spenceation
dfc44b8d14
Added Cisco UCS Chassis associated modules.
2017-09-12 12:25:58 -04:00
Mike Place
1a81663e46
Merge pull request #43302 from lyft/upstream-boto_cloudfront
...
Upstream boto_cloudfront execution and state modules
2017-09-12 10:10:20 -06:00
garethgreenaway
a29a9855a6
Fixing typo.
...
Fixing typo.
2017-09-12 08:47:55 -07:00
Mike Place
4f1e3bc24d
Merge pull request #43321 from sdodsley/purefa_module
...
Add module to control Pure Storage FlashArray
2017-09-12 09:37:21 -06:00
Nicole Thomas
f1a93401d1
Merge pull request #43425 from garethgreenaway/42135_isolate_salt_scheduler
...
Isolate Salt Scheduler
2017-09-12 09:05:06 -04:00
Nicole Thomas
4b5bf54aa8
Merge pull request #43450 from mc/typofix20170912
...
typofix 'tempalte' => 'template'
2017-09-12 09:00:55 -04:00
ribx
b712f971f7
Merge branch 'develop' into develop
2017-09-12 11:49:29 +02:00