Pedro Algarvio
faa44aa77a
Merge pull request #12931 from terminalmage/docs
...
Correct inaccuracies in gitfs walkthrough
2014-05-21 12:56:58 +01:00
Erik Johnson
93245d1e0e
Correct inaccuracies in gitfs walkthrough
...
Also, added some information on upcoming features
2014-05-21 01:35:00 -05:00
Erik Johnson
8d4370accc
Fix indentation
...
This brings the note about the gitfs walthrough outside of the YAML
code-block.
2014-05-21 01:34:28 -05:00
Seth House
b30732ce63
Merge pull request #12927 from gravyboat/develop
...
Updated the quickstart so we can get rid of the standalone minion docs.
2014-05-20 21:35:38 -06:00
Forrest Alvarez
b588393a7b
Updated the quickstart so we can get rid of the standalone minion docs.
2014-05-21 03:33:09 +00:00
Seth House
4e483bff23
Merge pull request #12926 from gravyboat/develop
...
Updated the troubleshooting index with some link fixes for 12791.
2014-05-20 20:44:04 -06:00
Forrest Alvarez
8c8060e6ea
Updated the troubleshooting index with some link fixes for 12791.
2014-05-21 02:42:12 +00:00
Erik Johnson
7cedb9ef47
Merge pull request #12925 from hulu/simplify-conds
...
simplify conditions in utils.network due to short-circuit eval
2014-05-20 20:05:12 -05:00
Chris Rebert
4b6b7eaec0
simplify conditions in utils.network due to short-circuit eval
2014-05-20 17:05:15 -07:00
Seth House
2dc7feb4d6
Merge pull request #12923 from lyft/boto-documentation
...
Adding boto_* modules and states to documentation.
2014-05-20 16:07:43 -06:00
Ryan Lane
92f21c7b05
Adding boto_* modules and states to documentation.
2014-05-20 18:06:17 -04:00
Joseph Hall
11762f2ea9
Merge branch 'yanatan16-patch-linode-libcloud-args' into develop
2014-05-20 15:39:41 -06:00
Joseph Hall
f29e1a06ec
Cleaning up whitespace
2014-05-20 15:39:30 -06:00
Jon Eisen
d4a49e4bca
Allow arbitrary libcloud args in salt cloud profile
2014-05-20 14:15:03 -07:00
Joseph Hall
0ac13b73f6
Merge pull request #12919 from gtmanfred/develop
...
revert 00bd39fd8d
2014-05-20 14:32:46 -06:00
Daniel Wallace
9abb33f883
revert 00bd39fd8d
2014-05-20 15:29:53 -05:00
Joseph Hall
7bcd17129d
Merge pull request #12909 from s0undt3ch/develop
...
The helper method is now released
2014-05-20 08:15:49 -06:00
Joseph Hall
37cb27cc9d
Merge pull request #12888 from crook/aliyun
...
Add Aliyun provider for salt-cloud
2014-05-20 07:50:41 -06:00
Pedro Algarvio
5a8575dbb9
The helper method is now released
2014-05-20 10:53:47 +01:00
Thomas S Hatch
0efb50cde6
Merge pull request #12885 from ranl/win_useradd_userprofile
...
win_useradd: getting %USERPROFILE% from the registry
2014-05-20 06:32:13 +02:00
Seth House
7d484dc86a
Restore trackalyzer stuff; opt-in within on_saltstack conditional
2014-05-19 18:29:09 -06:00
Ray Chen
542b437891
pylint coding format
2014-05-20 08:27:09 +08:00
David Boucha
956a3d878f
Merge pull request #12905 from UtahDave/develop
...
add windows 2014.1.4 installer links to docs
2014-05-19 18:24:33 -06:00
David Boucha
6b60f45afe
add windows 2014.1.4 installer links to docs
2014-05-19 18:22:52 -06:00
David Boucha
9bbbb46193
Merge pull request #12904 from UtahDave/develop
...
bump windows installer version number
2014-05-19 18:18:35 -06:00
David Boucha
679b178111
bump windows installer version number
2014-05-19 17:57:50 -06:00
Ray Chen
9f07c2d268
Refine aliyun codes according to review comments. The create method
...
should use bootstrap utils.
2014-05-20 07:39:12 +08:00
Joseph Hall
92364a4496
Merge pull request #12900 from KennethWilke/develop
...
more yamly yaml
2014-05-19 16:45:17 -06:00
Pedro Algarvio
29862b5e2e
Merge pull request #12901 from terminalmage/clean-saltenv
...
Make saltenv stripping more concise
2014-05-19 22:52:18 +01:00
Erik Johnson
d179db530b
Make saltenv stripping more concise
...
We're already filtering __pub_* arguments from the kwargs before using
them to write the key/value pairs in repo config files, no need to do
two extra dict lookups here. This commit excludes saltenv from the repo
args in the same list comprehension where __pub_* arguments are
filtered.
2014-05-19 16:41:55 -05:00
Colton Myers
5d92657b25
Merge pull request #12896 from bechtoldt/develop
...
updating homebrew installation URL in Mac OS X Walkthrough TUT (doc)
2014-05-19 15:26:32 -06:00
Colton Myers
1ddcc738e9
Merge pull request #12894 from cachedout/pydsl_exc
...
PyDSL exception handling
2014-05-19 15:25:36 -06:00
Colton Myers
d6a126a482
Merge pull request #12897 from terminalmage/issue12883
...
Fix traceback when syncing custom types
2014-05-19 15:25:15 -06:00
Colton Myers
73458ef974
Merge pull request #12898 from cachedout/publish_exc
...
Catch exception in publish when in masterless.
2014-05-19 15:24:34 -06:00
KennethWilke
713a0ed4eb
more yamly yaml
2014-05-19 16:24:27 -05:00
Colton Myers
f1fb48f277
Merge pull request #12899 from cachedout/schedule_doc
...
More comprehensive documentation on scheduler
2014-05-19 15:24:03 -06:00
Colton Myers
d584faa75b
Merge pull request #12893 from basepi/streetsahead
...
Fix test states for `test=True`
2014-05-19 15:23:00 -06:00
Mike Place
a9f20df543
Pylint
2014-05-19 15:00:16 -06:00
Mike Place
8b03270e1f
More comprehensive documentation on scheduler
2014-05-19 14:58:24 -06:00
Mike Place
0082fadece
Catch exception in publish when in masterless.
2014-05-19 14:28:09 -06:00
Mike Place
45ed9ce896
Merge pull request #12895 from basepi/mysqlqueryversionadded
...
Add verisonadded for mysql_query.py
2014-05-19 12:45:50 -06:00
Erik Johnson
728cda2b9a
Fix traceback when syncing custom types
...
This fixes a traceback which occurs when a rendering error occurs when
the top files are checked before custom types are synced.
2014-05-19 13:30:02 -05:00
Erik Johnson
419156a82b
Use !r formatting instead of double quotes
2014-05-19 13:28:50 -05:00
Arnold Bechtoldt
04a0133945
updating homebrew installation URL
2014-05-19 20:27:43 +02:00
Colton Myers
cd18e58474
Add verisonadded for mysql_query.py
2014-05-19 12:20:17 -06:00
Mike Place
9c9d50207a
PyDSL exception handling
...
Re-raise rendering errors as our own exception class.
2014-05-19 11:36:24 -06:00
Colton Myers
5eb941b8fb
Fix test=True for states without changes
...
If no changes are going to be made, result should be True or False, None
is reserved for when changes are going to be made.
2014-05-19 11:16:17 -06:00
Colton Myers
78c8190373
Remove slang from test states
2014-05-19 11:11:56 -06:00
Joseph Hall
efc8747c36
Merge pull request #12891 from gtmanfred/develop
...
remove saltenv from repo_opts in yumpkg.py
2014-05-19 10:37:06 -06:00
Daniel Wallace
72d2a28999
remove saltenv from repo_opts in yumpkg.py
...
Closes 12887
2014-05-19 11:08:54 -05:00
