Commit Graph

36188 Commits

Author SHA1 Message Date
Seth House
df6921ee26 Rename the cmd method in the Reactor to local for consistency
Also provide a backward-compat alias.
2014-10-17 09:15:26 -05:00
Joseph Hall
3996a999b5 Merge pull request #16700 from whiteinge/json-output-indent
Fix --out-indent for the JSON outputter
2014-10-17 05:44:46 -06:00
Seth House
c91cc43c61 Added missing CLI example 2014-10-17 02:53:16 -05:00
Seth House
9b399d232f Added convenience URL to generate minion keys and download as a tarball
Closes #16597.
2014-10-17 02:42:15 -05:00
Seth House
7f6bf1b1aa Added functions to execute runner and wheel functions from orchestrate 2014-10-16 23:24:47 -05:00
Seth House
70b8eaa2f6 Added documentation about the --out-indent flag 2014-10-16 20:50:44 -05:00
Seth House
23a6000381 Restore negative integer check for --out-indent flag
Fixes #16673.
2014-10-16 20:46:35 -05:00
Seth House
c6cb642f36 Added integration tests for the --out-indent flag for JSON output 2014-10-16 20:46:34 -05:00
Ethan Tuttle
751b582b45 gitfs: accept per-remote auth params (fixes #16698) 2014-10-16 17:13:09 -07:00
Thomas S Hatch
cce7dbd69f Merge pull request #16666 from terminalmage/release-notes-helium
Add new fileserver features to helium release notes
2014-10-16 16:48:08 -06:00
Thomas S Hatch
287ade4714 Merge pull request #16668 from davidjb/2014.7
Fix usage of state.show_sls for salt-ssh
2014-10-16 16:47:05 -06:00
Thomas S Hatch
f66fec8e87 fix issue with sys.doc and salt-ssh 2014-10-16 16:41:15 -06:00
Thomas S Hatch
98b22a2a9b Merge pull request #16690 from cachedout/issue_16658
Allow archive.extracted to be used during highstate run
2014-10-16 16:32:47 -06:00
Thomas S Hatch
e7c493aac6 Merge pull request #16689 from thatch45/rand-thin-fix
Rand thin fix
2014-10-16 16:32:19 -06:00
Thomas S Hatch
e2e901eb09 Fix rand_thin_dir 2014-10-16 15:46:23 -06:00
Mike Place
c5c5631ac1 Guh. Wron exception type. Derp. 2014-10-16 15:26:06 -06:00
Mike Place
2b85a8a1dc Missed one try/except 2014-10-16 15:10:18 -06:00
Mike Place
6da5e7343b Catch attribute error if str 2014-10-16 14:58:52 -06:00
Thomas S Hatch
512407c2c5 don't create a local tmp dir on the caller 2014-10-16 13:58:36 -06:00
Mike Place
b518fee488 Allow archive.extracted to be used during highstate run
Use state.single instead.
Use better target cache dir. (Note that this may cause previously cached
files to be re-cached!)
2014-10-16 13:54:56 -06:00
Thomas S Hatch
39193abffc Merge pull request #16686 from terminalmage/pkgrepo-fixes
Fix pkgrepo state failures
2014-10-16 13:52:47 -06:00
Thomas S Hatch
8a414d5328 set the wipe param based on what the sending command is 2014-10-16 13:15:49 -06:00
Thomas S Hatch
b6dd239b23 better error message 2014-10-16 12:41:19 -06:00
Thomas S Hatch
b1d1455d78 give better errors as to why the shim failed to deploy 2014-10-16 12:32:58 -06:00
Thomas S Hatch
4fb8f82eb6 disable minion data cache 2014-10-16 12:29:30 -06:00
Erik Johnson
83d89842b5 Don't catch generic exceptions
This is no longer necessary since none of the pkg.get_repo functions
throw exceptions for non-error conditions.
2014-10-16 13:21:30 -05:00
Erik Johnson
a3d62c5aa2 Don't throw exception when get_repo doesn't find repo
Instead, return an empty dict.
2014-10-16 13:14:35 -05:00
Erik Johnson
0f18619216 Don't throw exception when get_repo doesn't find repo
Instead, return an empty dict.
2014-10-16 13:14:26 -05:00
Erik Johnson
ee7a17f55b Don't throw exception when get_repo doesn't find repo
Instead, return an empty dict.
2014-10-16 13:13:52 -05:00
Thomas S Hatch
f299eed430 Merge pull request #16685 from thatch45/mods_fix
Assignment to mods where it was defaulting to None
2014-10-16 11:29:06 -06:00
Thomas S Hatch
e67d044726 more type checks 2014-10-16 11:13:52 -06:00
Thomas S Hatch
93e6ec42c8 don't shadow mod_data 2014-10-16 11:10:11 -06:00
Thomas S Hatch
199d40857a Add some safetly to mods 2014-10-16 11:08:39 -06:00
Thomas S Hatch
1f82784cbc Fix #16671 2014-10-16 11:04:57 -06:00
David\ Beitey
856eeb74cb Fix usage of state.show_sls for salt-ssh 2014-10-16 15:36:15 +10:00
Erik Johnson
48e81ac32d Add new fileserver features to helium release notes
Also made some formatting fixes
2014-10-15 22:44:43 -05:00
Erik Johnson
49c7e6ac1a Fix misspelled code-block type 2014-10-15 22:44:27 -05:00
Erik Johnson
00bd8477dd Fix sphinx build error
There is no 'math' lexer in sphinx.
2014-10-15 22:43:37 -05:00
Erik Johnson
bb6de490ef Grammar correction 2014-10-15 22:36:12 -05:00
Erik Johnson
1980c7a31e Remove old info from gitfs top-level docstring
The warning no longer applies since auth support was added for pygit2.

Also added a link to the gitfs walkthrough.
2014-10-15 22:33:56 -05:00
Thomas S Hatch
66e429aaa0 Merge pull request #16635 from terminalmage/aptpkg-fallback-virtual
Fallback to grep-available for virtual pkg support
2014-10-15 20:38:20 -06:00
Thomas S Hatch
bdb73c13b4 Merge pull request #16643 from bbinet/docker-restart-policy
Docker restart policy
2014-10-15 16:57:45 -06:00
Thomas S Hatch
26ae11b88d Merge branch 'cro-retcode_failure_test' into 2014.7 2014-10-15 16:56:56 -06:00
Thomas S Hatch
1f5da204a9 Fix lint 2014-10-15 16:56:41 -06:00
Thomas S Hatch
906719d691 Merge branch 'retcode_failure_test' of https://github.com/cro/salt into cro-retcode_failure_test 2014-10-15 16:56:12 -06:00
Thomas S Hatch
494527a442 Merge pull request #16659 from etuttle/s3fs-dirs
Properly discover directories in s3fs file server.  Fixes #16638.
2014-10-15 16:53:13 -06:00
Thomas S Hatch
99e42f5788 Merge pull request #16662 from rallytime/bp-16648
Backport #16648 to 2014.7
2014-10-15 16:10:57 -06:00
Thomas S Hatch
4b9178c1b8 Merge pull request #16652 from cachedout/issue_16504
Load __salt__ into wrappers for salt-ssh
2014-10-15 16:06:04 -06:00
Thomas S Hatch
03b2b4955c Merge pull request #16661 from thatch45/fix_rand_thin
Fix rand_thin dir system, it was broken in the heredoc PR
2014-10-15 15:35:44 -06:00
Ethan Tuttle
bbae532c01 Properly discover directories in s3fs file server. Fixes #16638.
Also, remove the dirs_only parameter to _find_files in pillar s3,
because it doesn't work in some cases and isn't used anyway.
2014-10-15 14:27:28 -07:00