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
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
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
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
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
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
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
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
Peter Sagerson
dc1768239d
acme.cert: avoid IOError on failure.
2017-09-12 13:17:20 -07: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
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
Rico Gloeckner
f452860316
typofix 'tempalte' => 'template'
2017-09-12 08:24:56 +02:00
Simon Dodsley
a8bfa4574c
Merge branch 'develop' into purefa_module
2017-09-11 20:54:39 -04:00
Aneesh Agrawal
2e9f1999f6
Upstream boto_cloudfront execution and state modules
...
AWS recently added support for tagging CloudFront distributions,
which allows us to start managing them via Salt
as we can insert a Salt-controlled identifier as a `Name` tag.
(CloudFront distributions get unique IDs generated by AWS,
which we can't predict and thus use to manage them idempotently.)
2017-09-11 23:36:31 +00:00
Mike Place
b4ca024e44
Merge pull request #43117 from garethgreenaway/slack_engine_class_fixes
...
Slack engine class fixes
2017-09-11 16:33:31 -06:00
Mike Place
ea4f903ed9
Merge pull request #43389 from raazvvann/nilrt_ip-fix-DNS
...
nilrt_ip: Fix DNS
2017-09-11 16:26:58 -06:00