Thomas S Hatch
484fa944c9
This fixes a bad data output when prereq prerequireds break
...
Fix #15463 Fix #15331
2014-09-03 09:55:10 -06:00
Joseph Hall
78b7ace6e1
Merge pull request #15469 from terminalmage/add-pygit2-install-link
...
Add pygit2 install link to gitfs walkthrough
2014-09-03 06:40:47 -06:00
Thomas S Hatch
1df582569f
Merge pull request #15449 from basepi/hideconcurrent
...
Hide `concurrent` arg for state.sls
2014-09-02 22:35:30 -06:00
Erik Johnson
3c800cdd5f
Add pygit2 install link to gitfs walkthrough
2014-09-02 23:33:11 -05:00
Thomas S Hatch
6fcdd1ed11
Merge pull request #15468 from thatch45/ssh_clean_pillar
...
Ssh clean pillar
2014-09-02 22:31:11 -06:00
Thomas S Hatch
8180ad9fc4
Merge pull request #15467 from thatch45/ssh_meta_2
...
Salt ssh meta data
2014-09-02 22:29:55 -06:00
Thomas S Hatch
4736382b1e
Merge pull request #15465 from thatch45/call_meta
...
Call meta
2014-09-02 22:29:27 -06:00
Thomas S Hatch
0944019c61
Add ssh_minion_cache option
2014-09-02 22:26:31 -06:00
Thomas S Hatch
397bb12674
set the wfuncs to handle the new metadata sent back
2014-09-02 21:46:59 -06:00
Thomas S Hatch
b543568896
refine metadata routine to get the correct data
2014-09-02 21:01:49 -06:00
Thomas S Hatch
d805d7d1d7
handle the metadata passed back from the caller routine
...
in salt ssh
2014-09-02 20:55:00 -06:00
Thomas S Hatch
0b613da1db
Add metadata to ssh call
2014-09-02 20:54:57 -06:00
Thomas S Hatch
10536753b5
Use the metadata option to display the full ret
2014-09-02 20:41:08 -06:00
Thomas S Hatch
923b8ad7aa
Add metadata optio to the parser
2014-09-02 20:40:56 -06:00
Thomas S Hatch
1d85209c7f
Merge pull request #15456 from cachedout/eauth_clarify
...
Clarify a point about runners and eauth
2014-09-02 17:33:48 -06:00
Thomas S Hatch
235dbca5ce
Merge pull request #15453 from terminalmage/remove-masterless-examples
...
Remove references to masterless salt from gitfs docs
2014-09-02 17:33:32 -06:00
Thomas S Hatch
3606bd4ef4
Merge pull request #15450 from cachedout/file_managed_list
...
Document multiple file.managed sources
2014-09-02 17:33:06 -06:00
Colton Myers
0fa830b5b5
Merge pull request #15445 from cachedout/issue_15418
...
Align highstate output
2014-09-02 16:24:49 -06:00
Mike Place
350b6f853a
Typo
2014-09-02 16:19:59 -06:00
Mike Place
3075b1fd33
Clarify a point about runners and eauth
2014-09-02 15:56:25 -06:00
Thomas S Hatch
e4b167c3ab
Merge pull request #15422 from nshalman/issue-14184
...
Use netstat on sunos.
2014-09-02 15:53:55 -06:00
Erik Johnson
510942d3ec
Remove references to masterless salt from gitfs docs
...
Alternate backends do not yet work with the local fileclient.
2014-09-02 15:59:05 -05:00
Erik Johnson
9b2fc52e93
Fix duplicate word
2014-09-02 15:31:13 -05:00
Erik Johnson
ac944272e0
Fix spelling error
2014-09-02 15:27:44 -05:00
Mike Place
f492fa68e6
Merge pull request #15451 from terminalmage/gitfs-docs-corrections
...
Remove extraneous word
2014-09-02 14:17:52 -06:00
Erik Johnson
ba3e0367c6
Remove extraneous word
2014-09-02 15:16:32 -05:00
Colton Myers
582565a739
Merge pull request #15443 from rallytime/fix_salt_cloud
...
Remove remote_exists function and add allow_failure=True
2014-09-02 14:09:14 -06:00
Mike Place
be8474086a
Document multiple file.managed sources
2014-09-02 14:07:27 -06:00
Colton Myers
5b768e5422
Hide concurrent arg for state.sls
...
This arg should almost never be used, so I don't think it should be
featured in the function signature. It remains documented in the
docstring, but with a giant warning below it.
2014-09-02 14:04:09 -06:00
Mike Place
3f79183da8
Merge pull request #15446 from terminalmage/gitfs-docs-corrections
...
More gitfs docs corrections/clarifications
2014-09-02 13:56:08 -06:00
Erik Johnson
0a5bc21b58
More gitfs documentation clarifications/corrections
2014-09-02 14:37:52 -05:00
Erik Johnson
ed631d69b5
Add fileserver_backend param to minion config documentation
...
Also correct an incorrect rst link target for hash_type
2014-09-02 14:36:35 -05:00
Erik Johnson
a3c62ef119
Add default value for fileserver_backend
2014-09-02 14:35:03 -05:00
Nahum Shalman
cc62191b8e
Use netstat on sunos: fixups
...
Make it DRYer, should no longer fail lint.
2014-09-02 14:57:52 -04:00
Mike Place
1ea2d417d2
Align highstate output
2014-09-02 12:52:13 -06:00
rallytime
ba934f99f4
Remove remote_exists function and add allow_failure=True
...
Fixes #15436
Get the `2014.7` branch inline with the `develop` branch and fix the salt-cloud regression on `develop`.
2014-09-02 12:40:34 -06:00
Mike Place
041d898a8f
Merge pull request #15441 from terminalmage/gitfs-docs-corrections
...
Gitfs documentation corrections
2014-09-02 12:27:02 -06:00
Erik Johnson
0ae4a108b7
Clarify outdated information in gitfs walkthrough
...
This paragraph predates the addition of pygit2 and dulwich support, and
seems to suggest that GitPython is required for gitfs, when that is no
longer necessarily true. This commit clarifies the wording here.
2014-09-02 13:22:56 -05:00
Erik Johnson
6e98ef828d
gitfs_provider has no default value
2014-09-02 13:22:47 -05:00
Thomas S Hatch
1cdf5bb693
Merge pull request #15423 from nshalman/2014.7-zeromq-linking-breakage
...
SmartOS esky: fix odd problem with zeromq linking
2014-09-02 11:01:03 -06:00
Thomas S Hatch
4b828176f9
Merge pull request #15404 from rallytime/cloud_nightly_tests
...
First pass at allowing jenkins.py to only run cloud tests
2014-09-02 09:41:25 -06:00
Thomas S Hatch
8ff839d1d6
Merge pull request #15364 from terminalmage/fix-zmq-warning-2014.7
...
Fix ZMQ warning (2014.7 branch)
2014-09-02 08:45:03 -06:00
Thomas S Hatch
b438e60469
Merge pull request #15339 from whiteinge/doc-back-ports
...
Added instructions on how to back-port fixes to release branches
2014-09-02 08:36:13 -06:00
Thomas S Hatch
2c3d2bbbed
Merge pull request #15332 from cachedout/cmmod_squelch_warning
...
Turn down warning.
2014-09-02 08:35:39 -06:00
Thomas S Hatch
b2023c918e
Merge pull request #15330 from cachedout/mine_args
...
Fix missing args issue in mine.send
2014-09-02 08:34:59 -06:00
Thomas S Hatch
f521979da6
Merge pull request #15327 from s0undt3ch/2014.7
...
Fix esky builds when using setuptools
2014-09-02 08:34:35 -06:00
Joseph Hall
309bd3d02e
Merge pull request #15413 from Jille/2014.7-fix-text
...
Small fixes in the comments in conf/minion
2014-09-02 08:29:25 -06:00
Jille Timmermans
4064a8cf4c
Fix some documentation inconsistencies
2014-09-02 11:38:23 +02:00
Mike Place
de884cf7eb
Use netstat on sunos.
...
Fixes #14184
2014-09-01 15:41:33 -04:00
Erik Johnson
6f3d381029
Merge pull request #15337 from eliasp/2014.7-grains.osmajorrelease
...
Don't return multiple elements for grain 'osmajorrelease'.
2014-09-01 14:23:45 -05:00
