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
70,390 Commits 24 Branches 182 Tags 341 MiB
ac8008d843
Commit Graph

70390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Boucha
e7c6012655 add support for default returners using return 2016-12-19 13:47:40 -07:00
Mike Place
09d9cff992 Merge pull request #38288 from terminalmage/archive-extracted-local-source-2016.3 
archive.extracted: don't try to cache local sources (2016.3 branch)
 2016-12-18 06:07:10 -07:00
Mike Place
bf37667f8a Merge pull request #38312 from cro/proxy_config_in_cfg 
Backport feature allowing proxy config to live in pillar OR /etc/salt/proxy
 2016-12-18 05:39:00 -07:00
Mike Place
c83db5a785 Merge pull request #38320 from rallytime/cleanup-doc-refs 
Cleanup doc internal markup references
 2016-12-18 05:31:27 -07:00
rallytime
62978cb7a0 Don't check the doc/conf.py file for doc markup refs 2016-12-16 13:56:12 -07:00
Mike Ford
6367ca7d2a Add nick to args for create_multi (#38281) 
Added the nick argument to the args provided to create_multi in the
send_msg_multi function
 2016-12-16 13:41:24 -07:00
Erik Johnson
845e3d0e75 Update tests to reflect change in cache behavior 2016-12-16 14:09:48 -06:00
Erik Johnson
5a08d7c70a archive.extracted: don't try to cache local sources (2016.3 branch) 
This will keep us from trying to cache file when we already have it
locally, which will help significantly with larger archives.
 2016-12-16 13:30:59 -06:00
rallytime
770e732d76 Add a unit test to search for new doc markup refs 2016-12-16 11:44:39 -07:00
C. R. Oldham
2006c4000e Typo 2016-12-16 10:29:44 -07:00
Mike Place
235682b1e6 Merge pull request #38313 from dragon788/2016.3-chocolatey-fix 
2016.3 chocolatey fix
 2016-12-16 10:20:39 -07:00
dragon788
1f5fc17551 Use machine readable output for list 
This actually fixes the issue in #38290 while the other change should improve the output for the states.
 2016-12-16 10:10:19 -06:00
dragon788
cdbd2fbe3c Added limit-output to eliminate false packages 
This should fix #38290 and maybe others.
 2016-12-16 10:10:01 -06:00
C. R. Oldham
689d95b10f Backport feature allowing proxy config to live in pillar OR /etc/salt/proxy. 2016-12-16 08:47:58 -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
9e78ddc80e Merge pull request #38279 from rallytime/fix-38174 
Add docs for syndic_wait setting
 2016-12-15 11:30:31 -07:00
rallytime
4a62d01577 Add docs for syndic_wait setting 
Fixes #38174
 2016-12-15 10:40:01 -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
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
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
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
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
Denys Havrysh
004bff113e Add missing requirements for running unit tests: libcloud and boto3 2016-12-12 13:18:38 +02:00
Mike Place
70f7d22ad6 Merge pull request #38191 from terminalmage/issue38162 
Clarify the fact that git_pillar.update does not fast-forward
 2016-12-12 02:45:48 -07:00
Mike Place
28171cbfc5 Merge pull request #38194 from vutny/integration-test-requirements-doc 
Document the requirements for running ZeroMQ-based integration tests
 2016-12-12 02:42:11 -07:00
Denys Havrysh
e9f419ff64 Document the requirements for running ZeroMQ-based integration tests 2016-12-10 22:16:18 +02:00
Erik Johnson
1ae543a98a Clarify the fact that git_pillar.update does not fast-forward 2016-12-09 22:52:12 -06:00
Nicole Thomas
a4ef037ab1 Merge pull request #38185 from rallytime/bp-38181 
Back-port #38181 to 2016.3
 2016-12-09 15:27:44 -07:00
rallytime
609f814454 Reset socket default timeout to None (fixes daemons_tests failures) 
Also removed skipIf logic when on Python 2.6. This fix resolves the
same test failures on 2.6 as well as Ubuntu 12 (which is apparently
running Pyhton 2.7 on our test images from Linode these days).
 2016-12-09 13:50:48 -07:00
Mike Place
65b2ad7b14 Merge pull request #38163 from Ch3LL/enabled_ec2_cloud 
enabled ec2 cloud tests
 2016-12-09 11:01:57 -07:00
Mike Place
b63f74e034 Merge pull request #38177 from vutny/fix-cp-get-file-str 
Correct `cp.get_file_str` docstring and add integration tests
 2016-12-09 09:55:35 -07:00
Denys Havrysh
a449980672 Correct cp.get_file_str docstring and add integration tests 2016-12-09 13:05:57 +02:00
Ch3LL
be74c45463 enabled ec2 cloud tests 2016-12-08 12:39:42 -07:00
Mike Place
7596313be0 Merge pull request #38153 from vutny/master-includes-error-tolerance 
Master config includes may contain errors and be safely skipped
 2016-12-08 10:43:34 -07:00
Denys Havrysh
cd0154ee93 Master config includes may contain errors and be safely skipped 2016-12-08 15:58:44 +02:00
Nicole Thomas
86091db647 Skip daemon unit tests when running on Python 2.6 (#38134) 
When switching the daemon unit tests to using multiprocessing pipes,
this exposed a deep bug in Python 2.6. Let's skip these on 2.6.
 2016-12-07 13:09:19 -07:00
Mike Place
d3d98fd4eb Merge pull request #38102 from rallytime/fix-38091 
Add False + msg tuple return if requests is missing for zenoss module
 2016-12-07 06:24:37 -07:00
Mike Place
8c8cbc2734 Merge pull request #38104 from rallytime/bp-36794 
Back-port #36794 to 2016.3
 2016-12-07 06:23:48 -07:00