valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
77,182 Commits 24 Branches 182 Tags 341 MiB
05e0192665
Commit Graph

77182 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CEG
05e0192665 Adding missing os_auth_system 2017-05-24 11:37:13 -06:00
CEG
4e0f4981e4 allow service_type to be specified 
default is now 'network'
 2017-05-24 11:29:28 -06:00
CEG
991e84343f Added non-profile and defaults for Neutron 2017-05-24 11:19:27 -06:00
CEG
c93f112c9b Updating Nova Module to include use_keystone Auth 2017-05-24 11:18:05 -06:00
CEG
66ab1e5184 Re-adding neutron dependency check 2017-05-23 20:06:05 -06:00
CEG
cce07eefc2 Updating Neutron module to suport KeystoneAuth 2017-05-23 20:00:42 -06:00
Nicole Thomas
3083764195 Merge pull request #41388 from bdrung/clean-doc-without-sphinx 
Do not require sphinx-build for cleaning docs
 2017-05-23 13:32:40 -06:00
Nicole Thomas
842875e590 Merge pull request #41364 from automate-solutions/fix-issue-41362 
Fix issue #41362 invalid parameter used: KeyName.1 instead of KeyName
 2017-05-23 11:32:09 -06:00
Nicole Thomas
92f94e66bc Merge pull request #41383 from peter-funktionIT/fix-win_pki-get_cert_file 
Update win_pki.py
 2017-05-23 11:26:43 -06:00
Benjamin Drung
5b79a0a9f8 Do not require sphinx-build for cleaning docs 
In a minimal build environment (no sphinx), the package cannot initially
clean itself because the upstream doc/Makefile checks for sphinx-build
executable and Debian doesn't get any benefit of that.

Thus do not check for the presence of sphinx-build when running the
clean or help target by adding a phony check_sphinx-build that does the
check for sphinx-build.

Debian bug: https://bugs.debian.org/851559
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2017-05-23 17:14:11 +02:00
peter-funktionIT
4d9bd06176 Update win_pki.py 
Always pass cert_format when calling get_cert_file from import_cert
 2017-05-23 12:02:09 +02:00
Mike Place
1ba95684a9 Merge pull request #41113 from cro/proxy_auto_test2 
Rescue proxy_auto_tests PR from git rebase hell
 2017-05-22 12:05:07 -05:00
Automate Solutions
cfd8eb7a87 Set DescribeKeyPairs back to KeyName.1 according to documentation 2017-05-22 18:32:42 +02:00
Mike Place
375892d910 Merge pull request #41360 from cro/sysrc_fix 
Sysrc on FreeBSD, YAML overeager to coerce to bool and int
 2017-05-22 10:54:31 -05:00
Mike Place
01b71c75c1 Merge pull request #41372 from terminalmage/issue41190 
Don't use intermediate file when listing contents of tar.xz file
 2017-05-22 10:36:44 -05:00
Mike Place
5edfcf972c Merge pull request #41373 from alex-zel/patch-3 
Allow HTTP authentication to ES.
 2017-05-22 10:32:09 -05:00
Erik Johnson
1f08936d9c Remove unused import 2017-05-22 02:18:28 -05:00
Erik Johnson
68cb897520 Replace reference to fileobj 
This was an argument I had initially added to _list_tar() but later
removed in favor of an isinstance check. Since this was removed, this
argument no longer exists.
 2017-05-22 02:13:56 -05:00
Alex Zel
3192eab128 Allow HTTP authentication to ES. 
Add option to authenticate to Elasticsearch instance with optional SSL.
 2017-05-22 09:09:37 +03:00
Erik Johnson
788874408a Remove '*' from mode 
This is unnecessary, as the data being piped in is uncompressed.
 2017-05-21 23:50:36 -05:00
Erik Johnson
3d4b833627 Don't use intermediate file when listing contents of tar.xz file 
This instead pipes the decompressed tar data directly to tarfile.open()
 2017-05-21 23:37:51 -05:00
Automate Solutions
6a82ddc6fc Fix issue #41362 invalid parameter used: KeyName.1 instead of KeyName 2017-05-21 15:47:25 +02:00
C. R. Oldham
6db31ce52a Fix problem with sysrc on FreeBSD, YAML overeager to coerce to bool and int. 
Fix problem with sysrc on FreeBSD, YAML overeager to coerce to bool
 2017-05-20 19:39:22 -06:00
Mike Place
29bd7f48b7 Merge pull request #41287 from garethgreenaway/40748_2016_11_consul 
Fix to consul cache
 2017-05-19 13:32:55 -05:00
Mike Place
672aaa88d3 Merge pull request #41309 from garethgreenaway/38894_allowing_test_argument 
Adding test argument for runners & wheel orchestration modules
 2017-05-19 13:26:08 -05:00
Mike Place
140b0427e1 Merge pull request #41319 from lomeroe/bp_41307 
backport #41307 to 2016.11, properly pack version numbers into single
 2017-05-19 13:24:59 -05:00
Mike Place
6bdb7cca7d Merge pull request #41327 from Ch3LL/add_2016.11.6_release 
Add 2016.11.6 Release Notes
 2017-05-19 13:05:08 -05:00
Mike Place
1faffd3932 Merge pull request #41329 from lorengordon/doc-fix 
Corrects versionadded for win_network.get_route
 2017-05-19 12:47:56 -05:00
Mike Place
6ca65592da Merge pull request #41322 from Ch3LL/fix_release_2016.11.5_notes 
Add patched packages warning to 2016.11.5 release notes
 2017-05-18 16:53:25 -05:00
Loren Gordon
3c471247f0 Corrects versionadded for win_network.get_route 2017-05-18 16:18:34 -04:00
Ch3LL
e5fc0aeb9c
Add 2016.11.6 Release Notes 2017-05-18 14:17:35 -04:00
Ch3LL
9a1bf4205f
fix url refs in rst 2017-05-18 12:42:35 -04:00
Ch3LL
cde008ff77
Add patched packages warning to 2016.11.5 release notes 2017-05-18 12:24:53 -04:00
Mike Place
9f359d841f Merge pull request #41208 from pkazmierczak/pkazmierczak-zypper-multiple-ver-pkgs 
Fix: zypper handling of multiple version packages
 2017-05-18 10:44:26 -05:00
Mike Place
bcef99adb6 Merge pull request #41317 from Ch3LL/update_latest_2016.11 
[2016.11] Bump latest release version to 2016.11.5
 2017-05-18 10:34:12 -05:00
lomeroe
4f0aa577a5 backport 41307 to 2016.11, properly pack version numbers into single 
number
 2017-05-18 09:37:53 -05:00
Ch3LL
cdb072c207
[2016.11] Bump latest release version to 2016.11.5 2017-05-18 09:39:04 -04:00
Gareth J. Greenaway
e1a88e8bf7 Allowing test=True to be passed for salt.runner and salt.wheel when used with orchestration 2017-05-17 14:06:23 -07:00
Mike Place
b8ddd7ee08 Merge pull request #41232 from axmetishe/2016.11 
Add basic auth for SPM
 2017-05-17 14:08:56 -05:00
Mike Place
7bdb66d969 Merge pull request #41236 from BenoitKnecht/2016.11 
states: cron: show correct changes when using `special`
 2017-05-17 13:51:57 -05:00
Mike Place
1c1e092f56 Merge pull request #41269 from isbm/isbm-minion-id-127-name 
Bugfix: Unable to use "127" as hostname for the Minion ID
 2017-05-17 13:31:15 -05:00
Mike Place
d0fa31d4ca Merge pull request #41289 from garethgreenaway/2016_11_5_fix_consul_cache_ls 
Fixing consul cache
 2017-05-17 11:54:11 -05:00
Mike Place
6566648948 Merge pull request #41303 from lomeroe/bp-41301 
backport #41301 -- properly convert packed string to decimal values
 2017-05-17 11:32:21 -05:00
lomeroe
f4b93f9d9a properly convert packed string to decimal values 2017-05-17 10:28:17 -05:00
Piotr Kaźmierczak
d411a91676 Reverted back to cascading with statements for python 2.6 compat 2017-05-17 11:52:56 +02:00
Gareth J. Greenaway
780a28c9a0 Swapping the order in the func_alias so the ls function is available. 2017-05-16 15:40:41 -07:00
Gareth J. Greenaway
5039fe12fb Removing chdir as it is no needed with this change 2017-05-16 15:04:07 -07:00
Gareth J. Greenaway
4550c3ce49 Updating the code that is pulling in the list of cached minions to use self.cache.list instead of relying on checking the local file system, which only works for the localfs cache method. #40748 2017-05-16 14:41:15 -07:00
Piotr Kaźmierczak
7204013653 Compacted with statements in the unit test. 2017-05-16 22:48:09 +02:00
Piotr Kaźmierczak
6c4c08042c Added unit tests and copied the behavior to 
.upgrade method, too.
 2017-05-16 20:47:04 +02:00