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,227 Commits 24 Branches 182 Tags 341 MiB
965f474316
Commit Graph

76227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
C. R. Oldham
965f474316 Merge pull request #39776 from cloudflare/proxy-schedule 
WIP: Save _schedule.conf under <proxy ID> dir
 2017-03-02 09:27:44 -07:00
Mike Place
555f1473f6 Merge pull request #39788 from cachedout/disable_api_test 
Disable one API test that is flaky
 2017-03-02 09:17:31 -07:00
Mike Place
523e377b33
Disable one API test that is flaky 2017-03-02 09:16:43 -07:00
Mircea Ulinic
35b8b8fd64 Save _schedule.conf under <minion ID> dir 
So each proxy can have its own scheduled functions, independently.
 2017-03-02 04:12:40 +00:00
Mike Place
793979cbe6 Merge pull request #39762 from terminalmage/issue39751 
Fix regression in file.get_managed
 2017-03-01 19:59:33 -07:00
Mike Place
91a9337ab3 Merge pull request #39767 from rallytime/bp-38316 
Back-port #38316 to 2016.11
 2017-03-01 19:54:57 -07:00
Mike Place
4a01bd64ea Merge pull request #39768 from rallytime/bp-39719 
Back-port #39719 to 2016.11
 2017-03-01 19:54:39 -07:00
Sébastien Coavoux
d7cb70f203 Enh: Support new version of tuned-adm binary 
Fixes #39692
 2017-03-01 15:16:10 -07:00
Michael Alphonso
1dcf018df7 requests api says Response.encoding can sometimes be None http://docs.python-requests.org/en/master/api/#requests.Response.encoding and result.text.encode() doesn't accept None and expects a string. 
this change prevents wrong-type runtime exceptions and defaults the encoding back to 'utf-8' (the default prior to PR#37912
 2017-03-01 15:14:03 -07:00
Mike Place
780457f934 Merge pull request #39760 from Ch3LL/2016.11.4_notes 
Initial 2016.11.4 Release Notes Doc
 2017-03-01 11:43:39 -07:00
Erik Johnson
64db0b8563 Add integration tests for remote file sources 2017-03-01 10:57:06 -06:00
Erik Johnson
f9f894d981 Fix regression in file.get_managed when skip_verify=True 2017-03-01 10:56:19 -06:00
Ch3LL
1853c998c4 add initial 2016.11.4 release notes 2017-03-01 09:47:07 -07:00
Erik Johnson
28651a6699 Remove next(iter()) extraction 
This is no longer needed since we're invoking the state module directly
and not via the state compiler.
 2017-03-01 10:19:33 -06:00
Mike Place
0147f78ab5 Merge pull request #39731 from twangboy/win_pkg_docs 
Add docs for Kwargs in pkg.refresh_db
 2017-02-28 15:02:58 -07:00
Mike Place
fce2d184f3 Merge pull request #39734 from garethgreenaway/39710_missing_schedule_add_parameter 
Missing parameter in the schedule.add function
 2017-02-28 13:43:07 -07:00
Gareth J. Greenaway
63eb610245 Per #39710, missing parameter in the schedule.add function 2017-02-28 11:18:11 -08:00
twangboy
423e6f7448 Add docs for Kwargs in pkg.refresh_db 2017-02-28 11:48:56 -07:00
Nicole Thomas
7b4865c058 Merge pull request #39729 from rallytime/update-release-ver-2016.11 
[2016.11] Bump latest release version to 2016.11.3
 2017-02-28 11:08:25 -07:00
Nicole Thomas
47e494fe07 Merge pull request #39721 from vutny/doc-targeting 
DOCS: add 2nd level header for advanced targeting methods
 2017-02-28 10:57:46 -07:00
rallytime
b5a7111ad9 [2016.11] Bump latest release version to 2016.11.3 2017-02-28 09:03:05 -07:00
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
Denys Havrysh
1d86cf1161 DOCS: add 2nd level header for advanced targeting methods 2017-02-28 16:23:53 +02: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