Elias Probst
37eeab2683
Typo (with → which)
2015-11-13 06:34:20 -07:00
C. R. Oldham
f032bffd7c
Lint
2015-11-12 16:26:05 -07:00
Colton Myers
359e7ca209
fix lint
2015-11-12 16:22:36 -07:00
Colton Myers
089828af9e
Merge branch 'cro' into 2015.8
2015-11-12 16:21:26 -07:00
Colton Myers
6bb6703c3e
Merge branch 'fx2_multi_creds' of git://github.com/cro/salt into cro
2015-11-12 16:20:53 -07:00
C. R. Oldham
3b7d22248c
Fix fallback credentials, add grains based on dracr.server_info and dracr.inventory, fix short-circuited for loop that was preventing retrieval of most data from CMC and DRAC devices, format responses from racadm more clearly.
2015-11-12 14:50:03 -07:00
Mike Place
778ace3ca5
Merge pull request #28842 from cachedout/tcp_shell_test
...
Add transport setting to shell test
2015-11-12 14:43:11 -07:00
Mike Place
785bf94f55
Add transport setting to shell test
2015-11-12 14:32:39 -07:00
Colton Myers
5639971744
Merge pull request #28837 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-11-12 14:17:14 -07:00
Colton Myers
1c91ad6765
fix lint
2015-11-12 13:13:39 -07:00
Mike Place
c4fb185147
Merge pull request #28827 from jacksontj/2015.8
...
Cleanup virtual_timer in loader
2015-11-12 12:39:29 -07:00
Colton Myers
4b706ac76a
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/troubleshooting/master.rst
2015-11-12 12:33:27 -07:00
Colton Myers
eb904665dc
Merge pull request #28832 from basepi/backport.28826
...
[2015.5] Backport #28826
2015-11-12 12:32:03 -07:00
Colton Myers
eff811a0ad
Merge pull request #28833 from basepi/increase.gather_job_timeout.8647
...
[2015.5] Increase the default gather_job_timeout
2015-11-12 12:31:58 -07:00
Mike Place
21520c6c1d
Merge pull request #28836 from cachedout/fix_tcp_wheel_tests
...
Cast to dict to fix wheel tests in tcp
2015-11-12 12:22:44 -07:00
Mike Place
8d3244166b
Cast to dict to fix wheel tests in tcp
2015-11-12 12:21:52 -07:00
Mike Place
560671a170
Merge pull request #28834 from cachedout/tcp_revert_master_uri
...
Fix breakage in tcp server
2015-11-12 11:57:18 -07:00
Mike Place
755d493bed
Fix breakage in tcp server
2015-11-12 11:56:25 -07:00
Colton Myers
e4a036365d
Merge pull request #28829 from basepi/merge-forward-2015.5
...
[2015.5] Merge forward from 2014.7 to 2015.5
2015-11-12 11:50:51 -07:00
Colton Myers
224602437a
Merge pull request #28804 from cachedout/tcp_test_fixes
...
TCP test fixes
2015-11-12 11:39:25 -07:00
Colton Myers
c09243dd01
Increase the default gather_job_timeout
...
If minions are offline, this will increase the total time it takes
for the CLI to realize they're offline and stop listening, but I
think that's a reasonable tradeoff for decreased issues with missing
real returns, like in #8647 .
Fixes #8647
2015-11-12 11:20:05 -07:00
Colton Myers
57be72eb91
Add backports_abc and singledispatch_helpers to thin as well
2015-11-12 11:15:41 -07:00
Colton Myers
897cad627b
Add singledispatch to the thin
2015-11-12 11:15:32 -07:00
Colton Myers
49992070db
Merge pull request #28826 from basepi/salt-ssh.singledispatch.thin
...
[2015.8] Add new tornado deps to salt-ssh thin
2015-11-12 11:14:43 -07:00
Mike Place
af52c3272f
Merge pull request #28759 from jfindlay/at
...
simplify stdin use of stdin in at.present state
2015-11-12 11:11:55 -07:00
Mike Place
08891cb210
Merge pull request #28824 from rallytime/bp-28778-and-28820
...
Back-port #28778 and #28820 to 2015.8
2015-11-12 11:06:31 -07:00
Colton Myers
5aeab71f76
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/fileclient.py
salt/states/blockdev.py
2015-11-12 11:06:00 -07:00
Colton Myers
f8b8441485
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
2015-11-12 11:01:07 -07:00
Thomas Jackson
f49502fd48
__modules__ isn't a global, although __salt__ is
...
This method is attempting to access the loader so that it can get an error message. The module loader is `__salt__` not `__modules__`. This before was throwing an exception in __virtual__ if dockerng.version wasn't in the modules. Pylint was also complaining about this, so I've remove the pylint override that was placed here as well.
2015-11-12 09:55:44 -08:00
Thomas Jackson
c734cb8876
Fix virtual_timer branch such that it will catch exceptions.
...
We got into some weird error conditions. In the reported issue if the module threw an exception in __virtual__ it was logged as returning None, instead of throwing an exception and logging so.
Fix for #28549
2015-11-12 09:55:43 -08:00
Mike Place
93562631aa
Merge pull request #28756 from MrCitron/fix-25775
...
Fix #25775
2015-11-12 10:47:50 -07:00
Colton Myers
1e1a74fd61
Add backports_abc and singledispatch_helpers to thin as well
2015-11-12 10:28:35 -07:00
rallytime
ab5943995b
Change versionaddeds to 2015.8.2 from Boron
2015-11-12 10:05:44 -07:00
C. R. Oldham
da7ad0df99
Add versionadded directives.
2015-11-12 10:04:17 -07:00
Todd Tomkinson
4bdd10fdf5
documentation updates
2015-11-12 10:03:56 -07:00
Todd Tomkinson
675bc2acce
more pylint fixes
2015-11-12 10:03:51 -07:00
Todd Tomkinson
8e19b5c518
pylint fixes
2015-11-12 10:03:43 -07:00
Todd Tomkinson
ba94878f45
marathon and chronos proxy minions
2015-11-12 10:03:38 -07:00
Mike Place
f799971280
Change logic
2015-11-12 09:17:42 -07:00
Bo Maryniuk
2d43199d20
Preserve 'first found first win' ordering
2015-11-12 10:50:26 +01:00
Bo Maryniuk
1c59eedec2
Enhance 'which' decorator reliability for peculiar environments
2015-11-12 10:34:36 +01:00
Mike Place
30ea94439c
Merge pull request #28803 from jfindlay/sdecodes
...
decode strings to utf-8
2015-11-11 21:59:38 -07:00
Nicole Thomas
59b505ff7c
Merge pull request #28782 from rallytime/rabbitmq-user-state
...
Fixes to rabbitmq user state
2015-11-11 17:59:57 -07:00
Mike Place
52ed06500a
Fix typo
2015-11-11 16:28:40 -07:00
Mike Place
9b18f372e6
Normalize IPC check among transports
2015-11-11 16:26:32 -07:00
Mike Place
e8ead2bfed
Allow for tcp transport in publish
2015-11-11 16:26:10 -07:00
Mike Place
e33b903e7b
Allow for tcp transport in mine
2015-11-11 16:25:53 -07:00
Mike Place
3d80e67a2d
Allow for tcp transport in auth
2015-11-11 16:25:39 -07:00
Justin Findlay
11163380cf
sdecode chunk name in state compiler
2015-11-11 16:17:37 -07:00
Justin Findlay
7f95c483e1
sdecode strings in file state
2015-11-11 16:16:11 -07:00
