Thomas S Hatch
0577b4070b
lint fix
2014-07-25 10:21:31 -06:00
Thomas S Hatch
f3e6841401
Merge pull request #14452 from s0undt3ch/hotfix/osx-pyt-nr
...
Skip test on Darwin after making an effort
2014-07-25 10:20:10 -06:00
Thomas S Hatch
14159615c8
Merge pull request #14268 from whiteinge/salt-runner-sync-async
...
Add sync/async Runner calls & sync/async Wheel calls that all respect eauth
2014-07-25 10:07:54 -06:00
Joseph Hall
f60063b6d8
Merge pull request #14487 from s0undt3ch/hotfix/transifex-updates
...
Update 'doc/.tx/config' - Build #123
2014-07-25 08:58:28 -06:00
Pedro Algarvio
4fa7d3ad64
Update 'doc/.tx/config' - Build #123
...
http://cookingwithsalt.org/job/salt/job/transifex/123/
Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
2014-07-25 15:57:15 +01:00
Seth House
73d798c117
Added timeouts to the Runner/Wheel sync calls
2014-07-24 16:19:40 -06:00
Seth House
bf9128362e
Use WheelClient instead of the deprecated Wheel
2014-07-24 16:08:31 -06:00
Seth House
2bc1ed8afb
Switch NetapiClient to use client_config instead of master_config
...
We access the Salt master through client interfaces and should use the
correct config when doing so. We should also reuse the already-loaded
opts when instantiating LocalClient().
2014-07-24 16:08:31 -06:00
Seth House
33043ef919
Added NetapiClient integration tests
2014-07-24 16:08:31 -06:00
Seth House
1bb29bd111
Add runner_async and wheel_async clients to NetapiClient
...
Also switch from master_call to new public-facing methods.
2014-07-24 16:08:30 -06:00
Seth House
bd72c35f7c
Add tests for the cmd_sync and cmd_async RunnerClient methods
2014-07-24 16:08:30 -06:00
Seth House
c34cddcfbb
Move eauth_creds to class-level for reuse
2014-07-24 16:08:30 -06:00
Seth House
b077b2436e
Add 'auto' eauth backend for tests
2014-07-24 16:08:30 -06:00
Seth House
a4cc496bc7
Renamed call_func to cmd for consistency; made compat alias
...
Added WheelClient() documentation on the non-eauth cmd & async funcs.
2014-07-24 16:08:30 -06:00
Seth House
7f147e1212
Added cmd_sync, cmd_async methods to WheelClient docs
2014-07-24 16:08:29 -06:00
Seth House
4404bc0f7f
Added function to execute WheelClient() functions asynchronously
2014-07-24 16:08:29 -06:00
Seth House
7aad94b5fe
Refactored WheelClient() to use sync/async mixin classes
2014-07-24 16:08:29 -06:00
Seth House
b98754787c
Added a cmd_sync method to WheelClient
...
This matches the behavior and semantics of the RunnerClient() method of
the same name.
2014-07-24 16:08:29 -06:00
Seth House
fa168828dc
Refactored RunnerClient to use sync/async mixin classes
2014-07-24 16:08:28 -06:00
Seth House
aa40d6af4d
Added two mixin classes, copied from RunnerClient, for executing funcs
2014-07-24 16:08:28 -06:00
Seth House
6e40307efc
Document new cmd_sync, cmd_async RunnerClient methods
...
Also de-emphasize the direct master_call method. Since master_call is
inconsistent between RunnerClient and WheelClient we should instead
present a single, consistent interface.
2014-07-24 16:08:28 -06:00
Seth House
35833ab294
Add cmd_sync and cmd_async methods to RunnerClient()
2014-07-24 16:08:27 -06:00
Seth House
75540a657d
Return the jid as well in the RunnerClient.async() return
2014-07-24 16:08:27 -06:00
Pedro Algarvio
e8c4de761f
Merge pull request #14472 from whiteinge/new-doc-modules
...
Added docs for new module additions
2014-07-24 23:02:31 +01:00
Pedro Algarvio
8154671497
Merge pull request #14466 from cro/rhel7_pkgtests
...
Fix two RHEL7 tests
2014-07-24 22:59:18 +01:00
Seth House
6517e7f378
Added generated new module docs
2014-07-24 15:56:19 -06:00
Seth House
81af51bf50
Added new module docs
2014-07-24 15:28:11 -06:00
Samuel Smith
bd013e8ea5
Merge pull request #14468 from SmithSamuelM/sam_2014.7
...
Support for RAET v0.2.09
2014-07-24 15:24:32 -06:00
Samuel M Smith
fc7f94190f
Merge remote-tracking branch 'upstream/2014.7' into sam_2014.7
2014-07-24 15:16:55 -06:00
C. R. Oldham
9dc3f696ca
Fix two RHEL7 tests
2014-07-24 14:11:03 -07:00
Samuel M Smith
6800ad3190
Removed redundant method
2014-07-24 15:04:30 -06:00
Joseph Hall
4d176726de
Merge pull request #14461 from seacrib/nova_password_fix
...
Check if api_key is set in kwargs instead of checking for key
2014-07-24 11:48:25 -06:00
seacrib
c902673b90
Check if api_key is set in kwargs instead of checking for key
2014-07-24 10:54:54 -06:00
Thomas S Hatch
cb76f14ad5
Merge pull request #14457 from rallytime/augeas_cli_example
...
Add context to augeas.execute CLI example
2014-07-24 10:29:01 -06:00
rallytime
598e5fc0fa
Add context to augeas.execute CLI example
2014-07-24 09:43:56 -06:00
Pedro Algarvio
ea01af39b4
Skip test on Darwin after making an effort
2014-07-24 13:12:46 +01:00
Samuel Smith
566dd127e9
Merge pull request #14446 from SmithSamuelM/sam_2014.7
...
Updated SaltKeep Removed eid from RaetKey files since not one to one anymore
2014-07-23 16:32:52 -06:00
Samuel M Smith
0abf315677
Merge remote-tracking branch 'upstream/2014.7' into sam_2014.7
2014-07-23 16:24:59 -06:00
Thomas S Hatch
46d3f50afd
Merge pull request #14445 from cachedout/12098
...
Fix pillar overlay bug
2014-07-23 16:19:50 -06:00
Mike Place
2cceaf3794
Fix pillar overlay bug
2014-07-23 15:35:35 -06:00
Nicole Thomas
fbb636e3f2
Merge pull request #14442 from rallytime/skip_vt_test
...
Skip vt_test in os x - still needs some work to run
2014-07-23 15:11:39 -06:00
rallytime
9b9a60efea
Skip vt_test in os x - still needs some work to run
2014-07-23 14:40:03 -06:00
Nicole Thomas
486dbe3476
Merge pull request #14389 from s0undt3ch/hotfix/osx-pyt-nr
...
Allow the VT tests to run on OSX
2014-07-23 14:38:58 -06:00
Samuel M Smith
7f095487c7
removed estate id (eid, device_id) from RaetKey keydata in file
2014-07-23 14:33:34 -06:00
Thomas S Hatch
f85b6f823b
Merge pull request #14436 from rallytime/fix_cli_examples
...
Add CLI Example to augeas.execute
2014-07-23 13:27:00 -06:00
Samuel M Smith
0996122590
added dump parameter so keep.status
2014-07-23 12:56:16 -06:00
Samuel M Smith
a250c82e64
UPdated SaltKeep loadRemoteData was missing
2014-07-23 12:49:07 -06:00
Pedro Algarvio
6c7e39dfcd
Factor out into a function the current number of PTY's detection code
2014-07-23 19:43:18 +01:00
rallytime
0075c97846
Throw in a 'versionadded' as well
2014-07-23 12:24:41 -06:00
rallytime
a1f17e0610
Add CLI example to augeas.execute
2014-07-23 12:22:51 -06:00