valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
75,329 Commits 24 Branches 182 Tags 341 MiB
dad748f57a
Commit Graph

75329 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian Dannie Storgaard
42d367f39d Fixed faulty logic preventing instance initialisation. 2016-12-15 20:49:36 -07:00
rallytime
5c42a361a0 Remove ":doc:" references from all doc/topics/installation/* files 2016-12-15 16:50:16 -07:00
rallytime
23bce1c929 Remove ":doc:" references from all doc/topics/releases/* files 2016-12-15 16:45:51 -07:00
rallytime
4aafa41d22 Remove ":doc:" references from a bunch of doc/* files 2016-12-15 16:09:27 -07:00
rallytime
02bfe7912c Remove more ":doc:" references from doc/* files 2016-12-15 15:36:44 -07:00
rallytime
6e32267d0c Remove ":doc:" references in salt/* files 2016-12-15 14:03:56 -07:00
Mike Place
f4f0036f30 Merge pull request #38076 from doublescoring/fix-2016.11-38070 
Fix decoding of broken string from remote sources
 2016-12-15 12:05:25 -07:00
Mike Place
9e78ddc80e Merge pull request #38279 from rallytime/fix-38174 
Add docs for syndic_wait setting
 2016-12-15 11:30:31 -07:00
Mike Place
2ccab22c19 Merge pull request #38278 from rallytime/bp-38207 
Back-port #38207 to 2016.11
 2016-12-15 11:09:27 -07:00
Nicole Thomas
a748e842a8 Merge pull request #38277 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-12-15 11:09:10 -07:00
rallytime
4a62d01577 Add docs for syndic_wait setting 
Fixes #38174
 2016-12-15 10:40:01 -07:00
Andreas Tsaridas
5e8bf571d8 python3 compatibility and fix pylint 2016-12-15 09:48:28 -07:00
Andreas Tsaridas
e0df047000 remove empty strings from list but not ones with one empty space char 2016-12-15 09:48:28 -07:00
rallytime
49a3355915 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/netapi/rest_cherrypy/app.py
 2016-12-15 09:43:32 -07:00
Alexey Aksenov
70c8db5489 Fix decoding of broken string from remote sources 
Fixes #38070
Suggest to replace incorrect UTF symbols with the special replacement character.
This would simplily interation with broken things in the real world.
https://docs.python.org/3/howto/unicode.html#the-unicode-type
 2016-12-15 14:33:33 +03:00
Mike Place
0af343e71f Merge pull request #38232 from rallytime/fix-38231 
Strip final 'e' in key cmd to correct "deleteed" misspelling
 2016-12-15 03:38:48 -07:00
Mike Place
6c1ca9dae7 Merge pull request #38236 from gtmanfred/2016.11 
SELINUXTYPE should not be changed
 2016-12-15 03:37:06 -07:00
Mike Place
fc9e1dff35 Merge pull request #38248 from meaksh/salt-api-successfully-close-child-processes 
Successfully exit of salt-api child processes when SIGTERM is received
 2016-12-15 02:16:27 -07:00
Mike Place
3c718ed35e Merge pull request #38254 from terminalmage/check-pillarenv 
Also check if pillarenv is in opts
 2016-12-15 02:10:24 -07:00
Mike Place
fd32dc3e9b Merge pull request #38262 from terminalmage/issue38228 
Fix archive.extracted when --strip or --strip-components is in the options
 2016-12-15 01:57:18 -07:00
Mike Place
b232bd8ce8 Merge pull request #38264 from cloudflare/PORT-37862 
Port #37862 into 2016.11
 2016-12-15 01:51:20 -07:00
Mircea Ulinic
28bbb73151
Import from napalm_base instead of napalm 2016-12-15 06:41:49 +00:00
Mircea Ulinic
0a675afc40
Vice-versa docstring 2016-12-15 06:41:40 +00:00
Mircea Ulinic
09c50176e2
More docfix 2016-12-15 06:41:32 +00:00
Mircea Ulinic
215b8f38e2
Lint cleanup 2016-12-15 06:41:22 +00:00
Erik Johnson
6442f8a7b5 Add tests for --strip/--strip-components 
Also add a test for an unspecified archive_format, as this did not have
a test case.
 2016-12-14 21:57:14 -06:00
Erik Johnson
c502e68f12 Detect --strip/--strip-components in tar options and handle properly 2016-12-14 21:56:41 -06:00
Erik Johnson
e95770594d Add strip_components arg to archive.list 2016-12-14 21:54:47 -06:00
Nicole Thomas
56a8fa3f77 Add 2016.11.2 release notes (#38260) 2016-12-14 16:40:06 -07:00
Nicole Thomas
702d46244b [2016.11] Bump latest release version to 2016.11.1 (#38257) 2016-12-14 16:28:39 -07:00
Nicole Thomas
6b9060c38f [2016.3] Bump latest release version to 2016.11.1 (#38256) 2016-12-14 16:28:19 -07:00
Erik Johnson
fa9ad311c6 Also check if pillarenv is in opts 
This will future-proof this code against a problem similar to the one
fixed by https://github.com/saltstack/salt/pull/37721
 2016-12-14 12:13:07 -06:00
Erik Johnson
82b1b77631 Correct an inaccurate warning when top_file_merging_strategy == merge_all (#38233) 
The merge_all strategy uses all configured SLS files, so there is no
danger from "merging" like there is in the default strategy. Therefore,
this log entry is spurious when multiple top files exist and the merging
strategy is set to "merge_all".
 2016-12-14 11:08:19 -07:00
Daniel Wallace
d1b070c894 clean up selinux unit test 2016-12-14 11:33:00 -06:00
Pablo Suárez Hernández
ee6eae9855 Successfully exit of salt-api child processes when SIGTERM. 
So far, salt-api handles connection creating child processes, but this new
processes are not handling the SIGTERM signal, so when `systemctl stop salt-api`
is called the salt-api service is going to be KILLED by `TimeoutStopSec=3`
option of salt-api service. This causes that salt-api looks as FAILED for systemd
even if we perform a manually stop.
FAILED systemd services has different behavior when `systemd try-restart` is called
so we may have troubles i.e. when updating salt-api package.

This commit enables SIGTERM handling for salt-api child processes to perform a
successfully exit after SIGTERM.
 2016-12-14 11:34:43 +00:00
Denys Havrysh
c94e798b8a SysV init script for rpm: get and show unique PIDs only 2016-12-14 12:31:42 +02:00
Nicole Thomas
ba62fcf2ec Merge pull request #38234 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-12-13 11:28:02 -07:00
Daniel Wallace
96eabd4939 SELINUXTYPE should not be changed 
Without the `=`, SELINUXTYPE is also being matched in the
/etc/sysconfig/selinux file is being removed.

Also add `changes` to the result in the selinux state
 2016-12-13 12:22:18 -06:00
rallytime
6a327d1367 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2016-12-13 10:19:47 -07:00
rallytime
26e1ee3650 Strip final 'e' in key cmd to correct "deleteed" misspelling 
Fixes #38231
 2016-12-13 09:33:28 -07:00
Michael Calmer
4c710139b5 use default values for pop() to prevent KeyError raised 2016-12-13 17:31:58 +01:00
Mike Place
004e46afe7 Merge pull request #38198 from vutny/unit-tests-require-libcloud-boto3 
Add missing requirements for running unit tests: libcloud and boto3
 2016-12-13 07:12:20 -07:00
Michael Calmer
455c18325c provide kwargs to dockerng.create to provide all features to sls_build as well 2016-12-13 14:31:56 +01:00
Mike Place
9d497bc74c Merge pull request #38213 from rallytime/skip-tls-test 
Skip test_cert_info tls unit test on pyOpenSSL upstream errors
 2016-12-13 05:05:01 -07:00
Mike Place
203109dd17 Merge pull request #38224 from whiteinge/cors-options-unauthed 
Allow CORS OPTIONS requests to be unauthenticated
 2016-12-13 05:02:30 -07:00
Denys Havrysh
a6098bac1a Remove note about SaltTesting installation, now it is in the requirements 2016-12-13 11:38:35 +02:00
Mike Place
721a5feccd Merge pull request #38223 from whiteinge/salt-api-root_dirs 
Add root_dir to salt-api file paths
 2016-12-13 00:44:19 -07:00
Seth House
de4d3227ab Allow CORS OPTIONS requests to be unauthenticated 2016-12-12 22:56:30 -07:00
Seth House
bfbf390c0e Add root_dir to salt-api file paths 2016-12-12 21:30:54 -07:00
rallytime
bdb807fc7c Skip test_cert_info tls unit test on pyOpenSSL upstream errors 
The 16.0.0 version of pyOpenSSL has an upstream error in it that
causes a stacktrace in our test suite. The upstream issue has
been fixed in pyOpenSSL in 16.1.0 and upwards, but 16.0.0 is still
available.

This fix skips the test when the specific error generated by the
upstream bug is encountered during the test.
 2016-12-12 14:21:41 -07:00