valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
70,288 Commits 24 Branches 182 Tags 341 MiB
fd2ee7db30
Commit Graph

70288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
rallytime
c906c8a0d5 Pylint fixes 2016-12-06 16:18:25 -07:00
Dominic Schlegel
da3ebf83e6 FreeBSD sysctl module now handels config_file parameter in show method 2016-12-06 09:55:26 -07:00
rallytime
4f79d5a0d1 Add False + msg tuple return if requests is missing for zenoss module 
Fixes #38091
 2016-12-06 09:01:53 -07:00
Mike Place
fbc87769b9 Merge pull request #38083 from twangboy/fix_refresh_db 
Only delete .sls files from winrepo-ng [DO NOT MERGE FORWARD]
 2016-12-06 07:13:35 -07:00
twangboy
978af6d83c Remove only .sls files from the cached winrepo-ng 2016-12-05 12:24:16 -07:00
Mike Place
9dcfdeef6b Merge pull request #38059 from rallytime/daemons-test-fix 
Call exec_test for the Syndic daemon in tests.unit.daemons_test.py
 2016-12-03 21:18:41 -07:00
rallytime
eb372b27d8 Add missing "not" statement: The last syndic test should assertFalse() 2016-12-02 16:53:39 -07:00
rallytime
4e10f8e018 Call exec_test for the Syndic daemon in tests.unit.daemons_test.py 2016-12-02 13:08:41 -07:00
Mike Place
9cd42b9b3f Merge pull request #38039 from rallytime/fix-37939 
Check to see if a line is already commented before moving on
 2016-12-02 13:08:35 -07:00
Mike Place
a34a763984 Merge pull request #38045 from terminalmage/issue38037 
yumpkg.py: don't include non-upgrade versions found by "yum list available"
 2016-12-02 13:07:38 -07:00
rallytime
1da7aacfbe Update unit tests to account for additional file.search call 
Also removed some mocks that were not needed anymore for the
calls to ``file.contains_regex_multiline`` because that function
is no longer called in the state file.
 2016-12-02 11:22:10 -07:00
Erik Johnson
65289503d9 Simplify logic for matching desired pkg arch with actual pkg arch 2016-12-02 12:14:13 -06:00
Erik Johnson
3babbcda94 yumpkg.py: don't include non-upgrade versions found by "yum list available" 2016-12-02 12:14:13 -06:00
rallytime
8a685b1820 Check to see if a line is already commented before moving on 
Fixes #37939
 2016-12-01 16:52:56 -07:00
rallytime
f2c045520d Write an integration test demonstrating the issue 2016-12-01 16:52:03 -07:00
Mike Place
6724fe4871 Modify daemons test to use multiprocessing (#38034) 
* Modify daemons test to use multiprocessing

Without this approach, instantiating a master/minion from this test
would affect the parser tests down the line.

* Fix typo

* Fix copy/paste error

* Add missing attr
 2016-12-01 15:33:36 -07:00
Nicole Thomas
6942d5d95b Merge pull request #37995 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-11-30 13:12:55 -07:00
Sebastian Vela
cd66c179cb fix broken yaml code block (#38002) 2016-11-30 13:12:24 -07:00
Mike Place
3dd45fbedf Merge pull request #37912 from attiasr/fix_aws_response_encoding 
fix encoding problem aws responses
 2016-11-30 11:10:30 -07:00
Mike Place
69a74a4d2d Merge pull request #37950 from vutny/fix-starting-up-syndic 
Set default Salt Master address for a Syndic (like for a Minion)
 2016-11-30 11:09:03 -07:00
rallytime
b44e17921c Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-11-30 09:21:45 -07:00
Rudy Attias
ba4ec4e7f1 use Requests result encoding to encode the text 2016-11-30 18:13:06 +02:00
Denys Havrysh
7d9bc9abce syndic_master: correct default value, documentation and example config 2016-11-30 17:18:44 +02:00
Mike Place
7a7e36728f Merge pull request #37978 from terminalmage/ext_pillar_first-docs 
Add clarifying language to ext_pillar_first docs
 2016-11-30 07:35:07 -07:00
Erik Johnson
61ed9a8657 Add clarifying language to ext_pillar_first docs 
Also remove a sentence which may lead people to believe that they can
make git_pillar and pillar_roots share top/sls files and be compiled
together.
 2016-11-29 15:49:05 -06:00
Erik Johnson
7f269bc7f9 Add clarification on expr_form usage and future deprecation (#37964) 2016-11-29 13:45:11 -07:00
Mike Place
1001987f64 Catch possible exception from lsb_release (#37962) 
Fixes #37867
 2016-11-29 13:31:07 -07:00
Mike Place
330021cd8b Handle empty tokens safely (#37961) 
Closes #37945
 2016-11-29 13:29:47 -07:00
Denys Havrysh
92a7c7ed1b Set default Salt Master address for a Syndic (like for a Minion) 2016-11-29 17:03:28 +02:00
Mike Place
ea46639ce7 Merge pull request #37272 from vutny/fix-getting-default-logging-opts 
Get default logging level and log file from default opts dict
 2016-11-28 16:04:20 -07:00
Mike Place
f2f957da6c Merge pull request #37925 from kontrolld/add-ipv6-centos-network 
Fix missing ipv6 options centos network
 2016-11-28 15:38:43 -07:00
Mike Place
c07ad11279 Merge pull request #37899 from DSRCorporation/bugs/37059_schedule_task_hang 
Clear functions context in schedule tasks for ZeroMQ.
 2016-11-28 15:23:45 -07:00
Mike Place
a55519db40 Merge pull request #37928 from techhat/issue37737 
Don't modify self.opts directly
 2016-11-28 14:07:40 -07:00
Mike Place
9d17f1ce90 Merge pull request #37929 from gtmanfred/2016.3 
add list_nodes_min to nova driver
 2016-11-28 14:05:39 -07:00
Mike Place
3bb743b59f Merge pull request #37926 from kontrolld/fix-ipv6-centos-network 
Fixes no IPv6 functionality in /etc/sysconfig/network
 2016-11-28 13:40:00 -07:00
Nicole Thomas
271170a9f3 Merge pull request #37921 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-11-28 12:54:40 -07:00
Joseph Hall
a09a60e89b Don't modify self.opts directly 2016-11-28 12:43:48 -07:00
Joe Crowe
3ed42e5b44 updated 
removed an extra character.
 2016-11-28 13:46:06 -05:00
Joe Crowe
3b3bc4f239 Fixes no IPv6 functionality in /etc/sysconfig/network 2016-11-28 13:41:20 -05:00
Daniel Wallace
c7d2c73503 add list_nodes_min to nova driver 2016-11-28 12:41:16 -06:00
Joe Crowe
ac2b477412 Adding IPv6 functionality for CentOS /etc/sysconfig/network 2016-11-28 13:30:10 -05:00
Mike Place
6cd6429ac0 Merge pull request #37924 from cachedout/fix_gem_states 
Update test for new gem ver
 2016-11-28 11:17:53 -07:00
Mike Place
894cca3427
Update test for new gem ver 2016-11-28 11:17:07 -07:00
rallytime
523a67c422 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/conf.py
  - doc/topics/releases/version_numbers.rst
 2016-11-28 10:52:52 -07:00