Commit Graph

72031 Commits

Author SHA1 Message Date
rallytime
83d3ac4771 Decode byte strings when running tests in Python 3 2016-07-27 10:34:34 -06:00
Nicole Thomas
721e6dcce8 Merge pull request #34988 from rallytime/release-notes-update
Update release notes with new changes
2016-07-27 09:54:15 -06:00
rallytime
a2aae987a6 Update release notes with new changes 2016-07-27 09:53:19 -06:00
Fred Damstra
aff8347eb5 Incorporated Erik Johnson's suggestions. 2016-07-27 11:44:43 -04:00
Fred Damstra
8b56d76490 Adds support for multiple server-side event_returners.
The master config 'event_return' can now take a list
of returners which will each be called in turn. It
continues to function with the previous configuration
format of a single item.
2016-07-27 11:41:59 -04:00
Mike Place
a988d42209 Merge pull request #34936 from bebehei/bashcompletion-cache
Bash-completion cache output and improve behavior
2016-07-27 09:00:03 -06:00
Mike Place
28268208f9 Merge pull request #34937 from twangboy/int_tests_cp
Fix test_list_minion for Windows
2016-07-27 08:53:45 -06:00
Mike Place
847d8ea95f Merge pull request #34939 from twangboy/int_tests_git
Fix git integration tests for Windows
2016-07-27 08:44:35 -06:00
Mike Place
d63ac1671c Merge pull request #34946 from alprs/fix-venv_reqs_subdir
Fix virtualenv behavior when requirements files are in subdirectories
2016-07-27 08:43:27 -06:00
Mike Place
ed65a27377 Merge pull request #34965 from xlotlu/patch-1
grafana_datasource: fix missing name in state return
2016-07-27 08:37:56 -06:00
Mike Place
d1e808254e Merge pull request #34968 from rallytime/fix-34967
Older versions of psutil may not have the 'children' attribute for processes
2016-07-27 08:37:04 -06:00
Mike Place
6323723035 Merge pull request #34974 from thatch45/regen_thin
Regen the thin tarball option
2016-07-27 08:23:54 -06:00
Andreas Lutro
f773d63cbb normalize requirements path to be absolute 2016-07-27 14:00:16 +02:00
Anthony Shaw
dac5cec503
start doc layout 2016-07-27 19:56:35 +10:00
Anthony Shaw
a699bd237b
factor extend 2016-07-27 19:56:13 +10:00
Anthony Shaw
4eed537d71
add docstrings and tidy up the extend module 2016-07-27 15:21:13 +10:00
Anthony Shaw
64dfb07d53
refactor to combine the template file and the user context 2016-07-27 14:59:55 +10:00
Anthony Shaw
c9e255ece9 replace cookiecutter with my own recursive jinja2 copy 2016-07-27 14:13:43 +10:00
Anthony Shaw
5d84cdfbf8 salt uses YAML, why am I using JSON?! 2016-07-27 13:49:46 +10:00
Erik Johnson
1e0c53372a Add a cmd func to RunnerClient
Also remove warning about potentially needing one in the future
2016-07-26 20:45:24 -05:00
Erik Johnson
70d9119fbe Add notice about cmd func in mixins, be explicit about daemonizing 2016-07-26 20:45:24 -05:00
Erik Johnson
ee1df20581 Add jid to return from runner/wheel funcs executed within orchestration 2016-07-26 20:45:24 -05:00
Anthony Shaw
bbb5efb308 refactor the code to not use cookiecutter (1) 2016-07-27 09:39:54 +10:00
Erik Johnson
ae89b9063e Allow the client to optionally return all data (not just function return) 2016-07-26 18:07:43 -05:00
Anthony Shaw
b3ee6c60e5 rework all the templates to not use cookiecutter 2016-07-27 09:04:30 +10:00
Mike Place
a83cdf9339 Merge pull request #34831 from thatch45/recoverssh
If the thin does not match, then redeploy, don't error
2016-07-26 16:27:01 -06:00
Mike Place
054539a830 Merge pull request #34942 from jacksontj/develop
Fix file.managed test=true hiding errors
2016-07-26 16:24:43 -06:00
Thomas S Hatch
265b1dd7fb also wipe when regen thin 2016-07-26 16:19:57 -06:00
Mike Place
f765faa3aa Merge pull request #34957 from sjmh/2016.3
Don't fall through to checking auth entries
2016-07-26 16:16:17 -06:00
Thomas S Hatch
423a356ff5 Regen the thin tarball option 2016-07-26 16:15:20 -06:00
Mike Place
9cd052f07f Merge pull request #34959 from terminalmage/utils-in-runners
Make __utils__ dunder available in runner funcs
2016-07-26 16:13:35 -06:00
Mike Place
0ed0e43aa9 Merge pull request #34964 from techhat/thorcalc
Add Thorium module for performing calculations
2016-07-26 16:12:57 -06:00
Mike Place
16ee70867a Merge pull request #34966 from whiteinge/minion-swarm-opts-dict
Ensure 'data' remains a dictionary if conf file is empty or missing
2016-07-26 16:11:56 -06:00
Mike Place
2d3b95dec9 Merge pull request #34971 from cachedout/increase_timeout_grains_test
Increase timeout for grains test
2016-07-26 16:11:29 -06:00
Mike Place
82d271b43a Increase timeout for grains test 2016-07-26 16:10:30 -06:00
twangboy
47fb8379d7 Remove hosts and aliases from sub_minion conf 2016-07-26 16:07:55 -06:00
twangboy
d7800567f5 Fix hosts integration test 2016-07-26 16:00:07 -06:00
Benedikt Heine
5c45ac10e3 [bash-completion] remove old comment 2016-07-26 23:56:56 +02:00
Benedikt Heine
db58e62b0d [bash-completion] split modules and functions completion
change behavior to complete modules and functions separately. This helps
gaining overview during completion.
2016-07-26 23:56:56 +02:00
Benedikt Heine
99871f4c33 [bash-completion] cache function completions
Cache the function completions. This may be neccessary if timeout is too
high and therefore you may get stuck on your input line.
2016-07-26 23:56:56 +02:00
twangboy
15a7e98563 Fix linux path to hosts 2016-07-26 15:50:05 -06:00
twangboy
fb673a4f56 Add windows path for hosts file 2016-07-26 15:43:06 -06:00
Erik Johnson
0c08724a7c Merge pull request #34118 from ctrlrsf/i-33907-dont-walk-file-ignore-dirs
Don't traverse directories that match file_ignore_regex and file_ignore_glob
2016-07-26 15:28:03 -05:00
Fred Damstra
1a52a06923 Adds support for multiple server-side event_returners.
The master config 'event_return' can now take a list
of returners which will each be called in turn. It
continues to function with the previous configuration
format of a single item.
2016-07-26 16:22:13 -04:00
rallytime
28d28aa82e Older versions of psutil may not have the 'children' attribute for processes
We also should make sure the 'children' variable is instantiated before calling it.

Fixes #34967
2016-07-26 13:46:31 -06:00
Seth House
ca61237de7 Ensure 'data' remains a dictionary if conf file is empty or missing 2016-07-26 12:41:42 -06:00
Ionuț Ciocîrlan
49278059e5 grafana_datasource: fix missing name in state return 2016-07-26 21:40:00 +03:00
Joseph Hall
7251e62345 Update docstrings 2016-07-26 12:34:01 -06:00
Nicole Thomas
73d3b77a2c Merge pull request #34960 from rallytime/merge-develop
[develop] Merge forward from 2016.3 to develop
2016-07-26 12:32:41 -06:00
Joseph Hall
9c2cc6bf99 Add Thorium module for performing calculations 2016-07-26 12:30:22 -06:00