Pedro Algarvio
8b48542214
Merge pull request #15502 from UtahDave/develop
...
Fix some misspellings and grammar
2014-09-03 23:48:04 +01:00
David Boucha
a2cc5cbaaa
fix grammar
2014-09-03 16:40:05 -06:00
David Boucha
bc7b3289e8
fix some misspellings and grammar
2014-09-03 16:40:05 -06:00
Colton Myers
f8c6fc00b6
Merge branch '2014.7' into develop
2014-09-03 16:24:12 -06:00
Colton Myers
3a5f8281da
Merge pull request #15490 from basepi/backport_boto
...
Backport boto modules/states/tests
2014-09-03 16:23:35 -06:00
Thomas S Hatch
eed43c9a29
Merge pull request #15491 from thatch45/job_doc
...
Add doc on job cache
2014-09-03 15:37:30 -06:00
Thomas S Hatch
53855f7886
Add doc on job cache
2014-09-03 15:36:48 -06:00
Thomas S Hatch
df6a3c1963
Merge pull request #15479 from cachedout/no_cloud
...
Migrate salt.cloud.exceptions to salt.exceptions
2014-09-03 15:25:05 -06:00
Colton Myers
c7b666fe43
Bring boto state tests from develop to 2014.7
2014-09-03 15:22:55 -06:00
Colton Myers
c127b4bafe
Bring boto module tests from develop to 2014.7
2014-09-03 15:22:17 -06:00
Colton Myers
e8fc048367
Bring boto states from develop to 2014.7
2014-09-03 15:21:21 -06:00
Colton Myers
b565c6e7ec
Bring boto modules from develop to 2014.7
2014-09-03 15:20:23 -06:00
Thomas S Hatch
2f6ae96f37
Merge branch '2014.7' into develop
...
Conflicts:
salt/client/ssh/__init__.py
2014-09-03 14:43:07 -06:00
Thomas S Hatch
06ad20e1f2
Merge pull request #15483 from nmadhok/develop
...
Improving salt.modules.file
2014-09-03 14:38:47 -06:00
Mike Place
a46c4a85c3
Missed one lint
2014-09-03 14:36:52 -06:00
Mike Place
c8f67c2b89
Fix tests and lint
2014-09-03 14:17:27 -06:00
Mike Place
8974550868
Remove what seem to be unused imports.
2014-09-03 14:12:03 -06:00
Thomas S Hatch
9acf13bf39
Merge pull request #15480 from terminalmage/add-unit-file
...
Add salt-api unit file symlink
2014-09-03 14:02:01 -06:00
Nitin Madhok
b11a7cd5e5
Removing trailing whitespace
2014-09-03 15:54:08 -04:00
Nitin Madhok
0e61c4125d
Fixing sphinx violation and warning
2014-09-03 15:22:26 -04:00
Nitin Madhok
e89b02fb04
Improving salt.modules.file
2014-09-03 15:20:46 -04:00
Erik Johnson
cbdee403bd
Add salt-api unit file symlink
2014-09-03 13:42:21 -05:00
Mike Place
e5153ffd3d
Migrate salt.cloud.exceptions to salt.exceptions
...
This means that we no longer have to load salt.cloud when calling the
salt cli and paves the way for additional sandboxing of salt-cloud to avoid
unecessary imports.
2014-09-03 12:30:28 -06:00
Thomas S Hatch
166bafa74d
Merge pull request #15477 from shichao-an/fix-doc-typo
...
Fixed saltutil.cmd_iter doc for automodule
2014-09-03 12:09:58 -06:00
Thomas S Hatch
887a898728
Merge pull request #15475 from thatch45/ssh_user_iso
...
Ssh user iso
2014-09-03 12:09:18 -06:00
Thomas S Hatch
96d4dc3844
Merge pull request #15474 from thatch45/prereq_bad_data
...
This fixes a bad data output when prereq prerequireds break
2014-09-03 12:08:23 -06:00
Thomas S Hatch
931effa5a4
Merge pull request #2 from jacksontj/thatch45/prereq_bad_data
...
Add __run_num__ and __sls__ to prereq failure condition
2014-09-03 12:07:54 -06:00
Thomas S Hatch
787f163580
Merge pull request #15460 from thatch45/dmyerscough-15170-keep-comments
...
Merge #15217 with fixes
2014-09-03 12:07:14 -06:00
Thomas Jackson
f72a753bad
Add __run_num__ and __sls__ to prereq failure condition
...
In addition add some comments to hopefully explain what we are doing
2014-09-03 11:03:45 -07:00
Shichao An
0fc2bf5284
Fixed saltutil.cmd_iter doc for automodule
2014-09-03 10:00:12 -07:00
Thomas S Hatch
026ac7b201
Don't use underscores in options to the cli!
2014-09-03 10:05:36 -06:00
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
Thomas S Hatch
d5602028ce
Merge pull request #15466 from cimarronm/correct_test_result_states.file.prepend
...
Bugfix for result returned from states.file.prepend with test option
2014-09-03 09:01:42 -06:00
Thomas S Hatch
7bd6bfb681
Merge pull request #15464 from dmuntean/fix-mount-options-on-linux
...
Fix mount module and state on linux to stop remounting every time state is executed.
2014-09-03 08:51:08 -06:00
Thomas S Hatch
04f8d216f7
Merge pull request #15473 from thatch45/talwai-patch-2
...
Merge #15458 with lint fix
2014-09-03 08:48:31 -06:00
Thomas S Hatch
baef98da29
Lint fix
2014-09-03 08:46:58 -06:00
Thomas S Hatch
c1aa82173a
Merge branch 'patch-2' of https://github.com/talwai/salt into talwai-patch-2
2014-09-03 08:46:35 -06:00
Thomas S Hatch
ab1c6bcf27
One more test fix
2014-09-03 08:43:52 -06:00
Thomas S Hatch
5c3c460559
Merge pull request #15360 from cimarronm/module_pip_refactor
...
Refactored common code in salt.module.pip to make it easier to main...
2014-09-03 08:42:09 -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
00418effee
Add ssh_minion_cache option to the cli parser
2014-09-02 23:07:10 -06:00
Thomas S Hatch
56014f91b0
Make the default thin dir use the login user
2014-09-02 22:54:29 -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
666602ecf3
Merge pull request #15461 from cimarronm/grains_core_osfullname_key
...
Bug in grains.core
2014-09-02 22:31:39 -06: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
