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

77306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
4265959647 Merge pull request #41393 from rallytime/bp-41235 
Back-port #41235 to 2016.11
 2017-05-24 11:08:55 -05:00
Mike Place
83f54694f9 Merge pull request #41394 from rallytime/bp-41243 
Back-port #41243 to 2016.11
 2017-05-24 11:00:16 -05:00
Mike Place
3a45ac30f0 Merge pull request #41401 from bdrung/systemd-service-documentation-key 
Add documentation key to systemd service files
 2017-05-24 10:49:54 -05:00
rallytime
503f925275 Add missing import 2017-05-24 09:43:59 -06:00
Mike Place
d34333c30b Merge pull request #41404 from bdrung/fix-typos 
Fix typos
 2017-05-24 09:42:44 -05:00
Benjamin Drung
33a7f8b2ec Fix typos 
lintian found several spelling errors.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2017-05-24 12:50:29 +02:00
Benjamin Drung
3f7f30895d Add documentation key to systemd service files 
Documentation for systemd service files can be automatically viewed
using systemctl help servicename if this field is present. Thus add the
relevant man page, the local and online documentation to the
documentation key.
 2017-05-24 11:14:39 +02: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
rallytime
d2d9a3d29f Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/ref/cli/salt-cp.rst
  - salt/config/__init__.py
 2017-05-23 15:58:14 -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
Mike Place
a5351302af Lint fix 2017-05-23 11:39:30 -06:00
Arif Ali
05fadc0af3 Remove the keys that don't exist in the new change 2017-05-23 11:39:30 -06:00
Silvio Moioli
c79c0e3f43 rest_cherrypy: remove sleep call 2017-05-23 11:38:01 -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
Loren Gordon
f2f6da7039 Supports quoted values in /etc/sysconfig/network 
Fixes #41341
 2017-05-20 08:57:30 -04:00
Mike Place
d617c9fe72 Merge pull request #41265 from terminalmage/issue41234 
yumpkg: fix latest_version() when showdupesfromrepos=1 set in /etc/yum.conf
 2017-05-19 13:49:58 -05: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
Michael Calmer
f30f5c8a25 fix unit tests 2017-05-19 13:28:52 +02:00
Tomas Zvala
011d6d65e7 Fix #41335 - list index out of range on empty line in authorized_keys 2017-05-19 10:53:05 +02:00
Michael Calmer
428baa9bce fix setting and getting locale on SUSE systems 
Also on with systems with systemd, SUSE still uses /etc/sysconfig/language
 2017-05-19 09:51:52 +02: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
Erik Johnson
edf552fe9a Update PKG_TARGETS for RHEL-based distros 2017-05-18 11:15:06 -05: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
Mike Place
26bd914580 Merge pull request #41316 from Ch3LL/update_latest_2016.3 
[2016.3] Bump latest release version to 2016.11.5
 2017-05-18 10:33:43 -05:00
lomeroe
4f0aa577a5 backport 41307 to 2016.11, properly pack version numbers into single 
number
 2017-05-18 09:37:53 -05:00