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
80,636 Commits 24 Branches 182 Tags 341 MiB
1693e23e8e
Commit Graph

80636 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ronald van Zantvoort
1693e23e8e DNS2: CAA record parsing, lookup tree walking, option handling 2017-04-06 10:09:31 +02:00
Ronald van Zantvoort
70aac039a9 DNS2: Services parser 2017-04-06 10:09:31 +02:00
Pedro Algarvio
d8646f7122 Merge pull request #40550 from s0undt3ch/features/py3-pt2 
Resource leakage fixes
 2017-04-06 07:44:43 +01:00
Pedro Algarvio
29d4ce83ab
Py3 compat 2017-04-05 23:56:28 +01:00
Pedro Algarvio
2d32fab65b
Don't instantiate the log handler if unable to connect to server 2017-04-05 23:29:13 +01:00
Pedro Algarvio
0b2364e57d
White-space lint fix 2017-04-05 23:19:53 +01:00
Pedro Algarvio
281e0cafb2
Fix resource leakage 2017-04-05 23:18:00 +01:00
Pedro Algarvio
843e218572
Remove unmocked patching 2017-04-05 23:17:36 +01:00
Pedro Algarvio
eb588c772a
Add missing futures import 2017-04-05 23:16:52 +01:00
Pedro Algarvio
dd7092c495
Add missing import 2017-04-05 23:15:54 +01:00
Mike Place
29cfdc6eb3 Merge pull request #40531 from terminalmage/pr-35740 
Rebase/resubmit of PR #35740
 2017-04-05 15:26:10 -06:00
Mike Place
641b59354d Merge pull request #40541 from bbinet/upstream-pillarstack 
Update PillarStack stack.py to latest upstream version
 2017-04-05 15:22:58 -06:00
Nicole Thomas
4d7871e4d7 Merge pull request #40494 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-04-05 14:15:05 -06:00
rallytime
71f3c73150 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/template.py
  - salt/utils/pycrypto.py
  - tests/integration/modules/test_state.py
  - tests/unit/states/test_artifactory.py
  - tests/unit/test_template.py
 2017-04-05 13:02:14 -06:00
Nicole Thomas
3f0695575a Merge pull request #40540 from DSRCorporation/bugs/40494_merge_forward_cache_list_fix 
A quick fix for Cache has no 'list' attribute.
 2017-04-05 12:50:17 -06:00
Harris Dimitriou
c8dcfc75ca added 'versionadded' on documentation change 2017-04-05 12:54:19 -05:00
Harris Dimitriou
8d19790cda fixed show_pillar to support pillarenv 2017-04-05 12:54:19 -05:00
Harris Dimitriou
a781a0d0d1 fixed 'Template not found' error by adding a control in get_tops() not to look for top file if pillarenv is defined and is not equal to file_roots 2017-04-05 12:54:19 -05:00
Harris Dimitriou
d8de1254f5 git_pillar tries to respect pillarenv and only check when pillarenv = env, if pillarenv is set 2017-04-05 12:54:19 -05:00
Harris Dimitriou
9f0fda937e enabled pillarenv for state module 'state', now you can define pillarenv or if you dont state will try to find it from opts['pillarenv'] if passed on from orchestrate 2017-04-05 12:54:19 -05:00
Nicole Thomas
59db716817 Merge pull request #40510 from twangboy/deprecate_win_update 
Add deprecation warnings to win_update state and execution modules
 2017-04-05 11:47:56 -06:00
Mike Place
28fc048030 Merge pull request #40464 from terminalmage/userdata-renderer 
salt-cloud: Do not pass userdata_file through yaml renderer
 2017-04-05 11:32:06 -06:00
Mike Place
388fa4c5eb Merge pull request #40472 from daxroc/enhance/module/hadoop 
Enhance/module/hadoop
 2017-04-05 11:30:09 -06:00
Mike Place
f963e3be30 Merge pull request #40536 from github-abcde/utils-aws-header-fix 
Utils aws sig4 header fix
 2017-04-05 11:12:51 -06:00
Mike Place
846e51aed3 Merge pull request #40538 from q1x/develop 
Support for Zabbix mediatypes in states
 2017-04-05 11:11:20 -06:00
Mike Place
ee5f891002 Merge pull request #40523 from s0undt3ch/features/py3 
[WIP] A Little House Keeping and Addressing Py3 test suite leakage
 2017-04-05 10:58:32 -06:00
Nicole Thomas
f5b2bcf82c Fix a couple more Oxygen --> Fluorine references 2017-04-05 10:27:28 -06:00
Nicole Thomas
990bde4c07 Merge pull request #40530 from dmurphy18/aix_docupd 
Update release information for 2016.11.4 for additional AIX support
 2017-04-05 10:20:22 -06:00
Pedro Algarvio
94d944da52
Limit the size of the log records queue 2017-04-05 16:38:05 +01:00
Pedro Algarvio
0dbab2e07a
Get some more insights on memory consumption 2017-04-05 16:38:04 +01:00
Bruno Binet
6ed8f6c4ce Update PillarStack stack.py to latest upstream version 
which provides a fix for Windows minions:
https://github.com/bbinet/pillarstack/pull/29

and the following enhancements:
https://github.com/bbinet/pillarstack/pull/26
https://github.com/bbinet/pillarstack/pull/27
 2017-04-05 16:16:07 +02:00
Dmitry Kuzmenko
c0fd5634cf A quick fix for Cache has no 'list' attribute. 2017-04-05 16:45:32 +03:00
Raymond Kuiper
1ad3a5dc19 corrected linting errors 2017-04-05 14:36:17 +02:00
Pedro Algarvio
c98920c5fb Merge pull request #40535 from tonybaloney/doc_fix 
Update hacking.rst
 2017-04-05 09:34:39 +01:00
herbert.buurman
f08862428b salt/utils/aws.py: Removed salt.ext.six import as the code that used it got removed. 2017-04-05 10:06:28 +02:00
twangboy
70b61dda39 Fix unit tests, spell Fluorine correctly 2017-04-04 23:42:36 -06:00
twangboy
ad48feabd7 Move deprecation to Flourine 2017-04-04 23:27:06 -06:00
Anthony Shaw
97044bd998 Update hacking.rst 
this one is wrong too
 2017-04-05 15:12:08 +10:00
Anthony Shaw
25ec20ebb0 Update hacking.rst 
Small error in the instructions
 2017-04-05 15:08:40 +10:00
Pedro Algarvio
0c61c151c3
Fix state logic 2017-04-05 02:07:54 +01:00
Pedro Algarvio
de5fdc6ba8
Purge the account 2017-04-05 00:51:35 +01:00
Pedro Algarvio
cd1f7ba629
Let's use the system temp dir as it was to see if it fixes the test failure 2017-04-05 00:34:39 +01:00
Roche, Damien
4cd5d82f9d reverted back to split vs splitlines. 2017-04-04 22:41:17 +01:00
Erik Johnson
84ee693006 Nova and openstack don't accept base64-encoded userdata 
This fixes my bad copypasta.
 2017-04-04 15:41:43 -05:00
Erik Johnson
73f4c43e2a Allow for userdata_template to be disabled in a cloud_profile 
This handles the case where a global value has been set and it is
necessary to disable it for a single profile.
 2017-04-04 15:41:43 -05:00
Erik Johnson
78b4798b1b Update compile_template test to use StringIO 2017-04-04 15:41:43 -05:00
Erik Johnson
5f7c5613ce Properly handle renderers which return StringIO objects 2017-04-04 15:41:43 -05:00
Erik Johnson
d551b0d857 Bring in salt.utils.stringio from develop branch 2017-04-04 15:41:43 -05:00
Erik Johnson
6a6ef0adf8 Move userdata templating to salt.utils.cloud 2017-04-04 15:41:43 -05:00
Erik Johnson
b440d0c679 Update 2016.11.4 release notes for userdata_renderer -> userdata_template 2017-04-04 15:41:43 -05:00