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
76,205 Commits 24 Branches 182 Tags 341 MiB
d39b679d82
Commit Graph

76205 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
d39b679d82 Merge pull request #39711 from alankrita/fix-rest-eauth 
Fix error in Saltstack's rest auth "Authentication module threw 'status' "
 2017-02-28 08:56:08 -07:00
alankrita
ee426562a7 Fix error in Saltstack's rest auth "Authentication module threw 'status' " 
Fixes #39683

updated rest.auth method to get 'status' and 'dict' in the
http.query result
 2017-02-28 17:30:44 +05:30
Mike Place
3940321462 Merge pull request #39699 from techhat/httpshabang 
Strip shabang line from rendered HTTP data
 2017-02-27 17:05:00 -07:00
Nicole Thomas
00f121eade Merge pull request #39694 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-02-27 15:13:48 -07:00
Joseph Hall
559eb93576 Strip shabang line from rendered HTTP data 2017-02-27 15:05:25 -07:00
Mike Place
2c919e31d6 Merge pull request #39643 from drawsmcgraw/39642 
issue 39642 - boto_vpc.nat_gateway_present should accept parameter al…
 2017-02-27 13:19:08 -07:00
rallytime
756f1de2d2 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/states/file.py
 2017-02-27 13:13:46 -07:00
Pedro Algarvio
df013c5f31 Merge pull request #39666 from terminalmage/test_valid_docs 
Rewrite the test_valid_docs test
 2017-02-26 20:14:32 +00:00
Erik Johnson
5a3c099e4f Rewrite the tests_valid_docs test 
This uses a function in the runtests_helpers custom module to perform
all the logic, and only returns what failed the test. This saves us from
having to return the entire contents of sys.doc (as well as log all of
the function calls), and also removes the need to run sys.doc in batches
to get around the "max message size" issue.
 2017-02-26 12:21:00 -06:00
Mike Place
a29a7be7f8 Merge pull request #39662 from The-Loeki/py3cachefix 
Py3 compat: Force minions to be a list for local serialized caches
 2017-02-25 19:36:46 -07:00
Mike Place
b02ef984f7 Add comment 2017-02-25 19:34:39 -07:00
Ronald van Zantvoort
0fe5c90a05 Py3 compat: Force minions to be a list for local serialized caches 2017-02-26 00:54:40 +01:00
Erik Johnson
bd6efd18b1 Merge pull request #39644 from vutny/dockerng-docs 
Improve and align dockerng execution module docs
 2017-02-24 22:16:28 -06:00
Mike Place
3f8b5e6733 Merge pull request #39487 from bobrik/mode-docs 
Document default permission modes for file module
 2017-02-24 16:49:00 -07:00
Mike Place
fffab54078 Merge pull request #39516 from jettero/give-pillarenv-tops-similar-treatment 
Prevent spurious "Template does not exist" error
 2017-02-24 16:41:35 -07:00
Mike Place
f7389bf1f5 Merge pull request #39641 from smarsching/issue-39169-2016.3 
Return runner return code in a way compatible with check_state_result
 2017-02-24 16:07:10 -07:00
Mike Place
be9629b180 Merge pull request #39654 from skizunov/develop2 
Fix issue where compile_pillar failure causes minion to exit
 2017-02-24 15:47:51 -07:00
Mike Place
e63cbbaab9 Merge pull request #39653 from cachedout/26_odict 
Use salt's ordereddict for comparison
 2017-02-24 15:46:23 -07:00
Sergey Kizunov
9f80bbce07 Fix issue where compile_pillar failure causes minion to exit 
If there is a failure in `Minion._post_master_init` (for example,
the `compile_pillar` fails) and the `master_type` is `failover`,
then `MinionManager._connect_minion` will catch the exception and then
retry. However, the retry will cause the minion to exit because
`opts['master']` is currently a string and not a list. Fix this
case to enable the retry to not cause the minion to exit.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>

Conflicts:
	salt/minion.py
 2017-02-24 15:02:48 -06:00
Mike Place
91eb7210bb
Use salt's ordereddict for comparison 
Last thing needed for 2.6 compat
 2017-02-24 13:44:54 -07:00
Mike Place
0bc6027e68 Merge pull request #39609 from gtmanfred/2016.11 
intialize the Client stuff in FSClient
 2017-02-24 11:50:54 -07:00
Mike Place
28035c07b3 Merge pull request #39615 from skizunov/develop2 
Bonjour/Avahi beacons: Make sure TXT record length is valid
 2017-02-24 11:47:04 -07:00
Nicole Thomas
fc970b6a16 Merge pull request #39633 from terminalmage/fix-systemd-typo 
Fix misspelled argument in salt.modules.systemd.disable()
 2017-02-24 11:21:35 -07:00
Nicole Thomas
e9410fb669 Merge pull request #39617 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-02-24 09:07:54 -07:00
Denys Havrysh
c4988e874e Improve and align dockerng execution module docs 2017-02-24 16:46:45 +02:00
Drew Malone
56d9adfbf6 issue 39642 - boto_vpc.nat_gateway_present should accept parameter allocation_id. 2017-02-24 08:58:37 -05:00
Sebastian Marsching
88c2d9a540 Fix return data structure for runner (issue #39169). 
Previously, the return code of the runner (if any) was supplied in
ret['data']['retcode']. This was problematic if ret['data'] was later processed
by check_state_result. With this change, runners return the optional return
code in ret['retcode'], like the other code (modules, etc.) already did before.
 2017-02-24 13:02:52 +01:00
Erik Johnson
ca54541abe Add missing unit test for disable func 2017-02-24 01:12:42 -06:00
Erik Johnson
17109e1522 Fix misspelled argument in salt.modules.systemd.disable() 2017-02-24 01:09:51 -06:00
Erik Johnson
53e78d67f6 Merge pull request #39613 from terminalmage/fix-docs 
Fix inaccurate documentation
 2017-02-24 00:07:34 -06:00
Ivan Babrou
41ef69b3ca
Document default permission modes for file module 2017-02-23 19:36:24 -08:00
rallytime
13622899d2 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/topics/development/contributing.rst
 2017-02-23 14:37:48 -07:00
Daniel Wallace
0820620ef8 intialize the Client stuff in FSClient 
We need __utils__ in FSClient for s3:// uris.
 2017-02-23 15:20:22 -06:00
Sergey Kizunov
b1c7e9b505 Bonjour/Avahi beacons: Make sure TXT record length is valid 
TXT records are limited in length to 255 characters. Enforce
this requirement.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-02-23 14:58:15 -06:00
Erik Johnson
9342eda377 Fix inaccurate documentation 
The refresh argument does not do what was documented here. This fixes
that inaccuracy.
 2017-02-23 13:42:19 -06:00
Mike Place
0d31201e08 Merge pull request #39505 from cachedout/issue_38758 
Threadsafety option for context dictionaries
 2017-02-23 12:38:12 -07:00
Mike Place
c0d4357f46 Merge pull request #39507 from joe-niland/iis-7-cert-binding 
Detect IIS version and vary certificate association command depending on version
 2017-02-23 12:15:39 -07:00
Nicole Thomas
e6f5e8a474 Merge pull request #39565 from terminalmage/issue39512 
states.file.patch/modules.file.check_hash: use hash length to determine type
 2017-02-23 12:14:27 -07:00
Mike Place
53e22b8f15 Merge pull request #39591 from mcalmer/fix-case-in-os_family 
fix case in os_family for Suse
 2017-02-23 12:07:16 -07:00
Mike Place
aee43f7fa4 Merge pull request #39592 from skazi0/line-user-fix 
Ensure user/group/file_mode after line edit
 2017-02-23 11:40:04 -07:00
Mike Place
6ab4151213 Merge pull request #39596 from ticosax/reduce-scope-catehed-exception 
Reduce scope of try except StopIteration wrapping
 2017-02-23 11:16:17 -07:00
Mike Place
b1c3b84862 Merge pull request #39610 from rallytime/bp-39589 
Back-port #39589 to 2016.11
 2017-02-23 10:48:02 -07:00
Erik Johnson
cbdf905b9f Update test to reflect new state comment 2017-02-23 11:21:33 -06:00
Jarrod Moore
83ec174d44 Set utils property explicitly for FSClient 2017-02-23 10:19:11 -07:00
Jarrod Moore
3889006149 Allow masterless minions to pull files from S3 2017-02-23 10:19:11 -07:00
Nicole Thomas
4e2b852f83 Merge pull request #39600 from vutny/state-file-docs 
state.file: drop non-relevant examples for `source_hash` parameter
 2017-02-23 09:55:26 -07:00
Nicole Thomas
fe15ed9b92 Merge pull request #39606 from rallytime/lint-2016.11 
[2016.11] Pylint: add missing import
 2017-02-23 09:39:54 -07:00
rallytime
71164348e7 [2016.11] Pylint: add missing import 2017-02-23 09:36:14 -07:00
Mike Place
ed83420417 Merge pull request #39584 from cachedout/mentionbot_docs 
A note in the docs about mentionbot
 2017-02-23 08:12:13 -07:00
Denys Havrysh
9b0427c27a state.file: drop non-relevant examples for source_hash parameter 2017-02-23 17:02:09 +02:00