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,661 Commits 24 Branches 182 Tags 341 MiB
dd4269b328
Commit Graph

80661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
dd4269b328 Merge pull request #40574 from rallytime/lint-develop 
[develop] Lint Fixes
 2017-04-06 16:46:35 -06:00
rallytime
36cddd62d1 [develop] Lint Fixes 2017-04-06 16:45:22 -06:00
Mike Place
d349e35fad Merge pull request #40570 from cachedout/pkg_test_flaky 
Add flaky decorator to pkg tests
 2017-04-06 15:52:32 -06:00
Mike Place
fa2c8f852a Merge pull request #40557 from isbm/isbm-aws-doc-fix 
Fix the documentation for AWS
 2017-04-06 12:25:54 -06:00
Mike Place
69058ae67a
Add flaky decorator to pkg tests 2017-04-06 12:22:40 -06:00
Mike Place
77924aeabb Merge pull request #40566 from sjorge/logadm 
Update and refresh logadm module
 2017-04-06 12:19:32 -06:00
Nicole Thomas
03f0f4a8b3 Merge pull request #40561 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-04-06 12:15:27 -06:00
Mike Place
56363bc41c Merge pull request #40462 from cachedout/state_expect_minions 
Fix orch state when no minions return
 2017-04-06 11:58:14 -06:00
Mike Place
84fd77797f Merge pull request #40512 from mtkennerly/add-shortcut-file-state 
Add Windows shortcut support to salt.states.file
 2017-04-06 11:30:07 -06:00
Super-User
77911fcdf3 logadm.rotate now takes all options 2017-04-06 19:11:50 +02:00
Erik Johnson
5f61928988 Merge pull request #40559 from jinm/develop 
Fix v3 for https://github.com/saltstack/salt/issues/38472
 2017-04-06 12:04:00 -05:00
Mike Place
60750a1619
Fix test 2017-04-06 10:48:27 -06:00
Super-User
29fc259f5e make toggles match variable names in logadm.rotate 2017-04-06 17:59:46 +02:00
Super-User
572b8cc811 logadm _parse_options should handle flags with same value properly 2017-04-06 17:57:23 +02:00
Super-User
ddbd2b88eb logadm.list_conf should filter None and False flags by default 2017-04-06 17:31:03 +02:00
Super-User
d3ca3e5c6b logadm.logadm split parsing into private methode 2017-04-06 17:26:00 +02:00
rallytime
9b04dec7ef Merge branch '2016.11' into 'develop' 
No conflicts.
 2017-04-06 09:18:36 -06:00
jinm
4ef3fa6722 Fix v3 for https://github.com/saltstack/salt/issues/38472 2017-04-06 10:42:30 -04:00
Bo Maryniuk
99b7996ce6 Fix the documentation for AWS 2017-04-06 15:02:17 +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
mtkennerly
5184fe98d1 Fix pylint issues in file.shortcut. 2017-04-05 19:36:06 -04: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
Mike Place
cb9dcb1e1b Merge pull request #40543 from rallytime/fix-40005 
Add the "fingerprint_hash_type" option to ssh state and module
 2017-04-05 15:21:16 -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
rallytime
1ef81e6a55 Add the "fingerprint_hash_type" option to ssh state and module 
Fixes #40005

This new option allows the user to specify what kind of hash was
used when the public key was hashed to a fingerprint. The default
hash is md5, but the user should be able to specify this if they
know what the fingerprint was originally hashed with.
 2017-04-05 10:58:58 -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