Commit Graph

26342 Commits

Author SHA1 Message Date
Mike Place
f325ddc1a4 Merge pull request #10632 from rallytime/mac_user_test
More mac_user tests
2014-02-20 16:48:08 -07:00
David Boucha
0e4cbddd11 Merge pull request #10633 from goldbach/errnofix
fix win_file.append by importing errno
2014-02-20 15:18:56 -07:00
Thomas S Hatch
db717979f0 Merge pull request #10631 from goldbach/issue10521
fix #10521 - missing namespaced functions
2014-02-20 15:00:44 -07:00
goldbach
67660fb9f9 fix win_file.append by importing errno 2014-02-20 22:48:42 +01:00
goldbach
b06676ea5d fix win_file.append by importing errno 2014-02-20 22:45:50 +01:00
rallytime
ed614934f7 More mac_user tests 2014-02-20 14:25:38 -07:00
Thomas S Hatch
7fa7b5167f Add docstring to msgpack rednerer 2014-02-20 14:04:59 -07:00
Thomas S Hatch
b8ddb1b64e Add initial msgpack renderer 2014-02-20 14:01:07 -07:00
Thomas S Hatch
c8abd5a56a Merge pull request #10629 from makinacorpus/saltcallreturn
salt-call now returns jobs to master
2014-02-20 13:52:29 -07:00
Thomas S Hatch
54aee3c568 Merge pull request #10627 from makinacorpus/crondoc
update cron doc
2014-02-20 13:51:15 -07:00
Thomas S Hatch
86b6c246e6 Merge pull request #10630 from borgstrom/pyobjects_security
Pyobjects security & convention
2014-02-20 13:49:08 -07:00
Thomas S Hatch
f72d0c09c0 Merge pull request #10626 from hulu/lint
minor linting in dockerio module
2014-02-20 13:47:50 -07:00
Evan Borgstrom
796efac44f Update tests to use new syntax 2014-02-20 15:19:42 -05:00
Evan Borgstrom
b262a8f146 Normalize case for functions vs classes, add mine shortcut 2014-02-20 15:05:45 -05:00
Evan Borgstrom
a6c4f8a743 Ensure the scope of the exec calls is limited for both globals & locals 2014-02-20 14:55:23 -05:00
Mathieu Le Marec - Pasquet
8b54c55433 lint fixes 2014-02-20 20:39:53 +01:00
Mathieu Le Marec - Pasquet
537f96fe14 salt-call now returns jobs to master
This is related to #10500.

This finishes @thatch45 work
2014-02-20 20:31:40 +01:00
Mathieu Le Marec - Pasquet
9eaff256ec update cron doc 2014-02-20 20:14:00 +01:00
Chris Rebert
8c2548000e avoid shadowing id() built-in func in dockerio module 2014-02-20 10:48:55 -08:00
Chris Rebert
4c633d386a add clarifying parens in tuple literal 2014-02-20 10:45:03 -08:00
Thomas S Hatch
3a6ae81abb Merge pull request #10623 from whiteinge/document-creates
Added documentation on the new creates arg to various cmd.state funcs
2014-02-20 11:34:14 -07:00
Seth House
8d1eb49083 Added documentation on the new creates arg to various cmd.state funcs 2014-02-20 11:06:49 -07:00
Thomas S Hatch
4321a69180 Merge pull request #10459 from cachedout/getting_started
Getting started
2014-02-20 10:55:37 -07:00
Thomas S Hatch
2bc53b01f2 Merge pull request #10622 from gfa/develop
run after cloud-init if it's installed
2014-02-20 10:54:06 -07:00
Thomas S Hatch
42742722fb Merge pull request #10614 from stevage/develop
Clarify semantics of source, name and args as per Issue #10492
2014-02-20 10:53:19 -07:00
Thomas S Hatch
0a064f9ca3 Merge pull request #10611 from techdragon/ignore-sublime-text-project-files
ignore sublime text project files like other IDEs
2014-02-20 10:51:44 -07:00
Seth House
c8b96b901c Added introductory text to each Caller() instantiation example
The versionadded was easy to lose in the surrounding noise. This
hopefully makes it stand out a bit.
2014-02-20 10:30:36 -07:00
Thomas S Hatch
1ec0cf89c1 Merge pull request #10608 from terminalmage/glossary
Add glossary to toctree
2014-02-20 10:27:19 -07:00
Thomas S Hatch
1d4554433e Merge pull request #10607 from plastikos/issue-10604
Put the SSH defaults in config.py and use them.
2014-02-20 10:27:01 -07:00
Thomas S Hatch
92faa93295 Merge pull request #10606 from terminalmage/docs
Fix sphinx build errors/warnings, add new modules to toctree
2014-02-20 10:21:33 -07:00
Mike Place
b588e486ff Resolve merge conflict. 2014-02-20 10:18:45 -07:00
Thomas S Hatch
3d10b36650 Merge pull request #10605 from terminalmage/svnfs-mountpoints
Add svnfs mountpoints and per-remote params
2014-02-20 10:18:21 -07:00
Thomas S Hatch
7a3bf8aa85 Merge pull request #10600 from borgstrom/pyobjects_saltobject
Adding a object interface to __salt__ & __pillar__ (pyobjects)
2014-02-20 10:17:35 -07:00
Mike Place
f7f28d738c Grammar. 2014-02-20 10:16:08 -07:00
Mike Place
6dd1178cda More changes in walk-through for clarity.
Conflicts:
	doc/topics/tutorials/walkthrough.rst
2014-02-20 10:16:02 -07:00
Mike Place
e32b0077d8 Moved YAML documentation into renderer page.
Conflicts:
	doc/topics/yaml/index.rst
2014-02-20 10:15:50 -07:00
Thomas S Hatch
f4e10899f7 Merge pull request #10599 from olliewalsh/fix_10581
Fix issue #10581
2014-02-20 10:13:47 -07:00
Thomas S Hatch
b67272ea1b Merge pull request #10570 from ahammond/normalize_mapper_mounts
guess at how to solve issue #10257
2014-02-20 10:11:55 -07:00
goldbach
80fb9a9ea2 fix #10521 - missing namespaced functions 2014-02-20 18:10:23 +01:00
Thomas S Hatch
6839eb1a56 fix cron test error in lint 2014-02-20 10:05:56 -07:00
Thomas S Hatch
a93bd0f596 Merge pull request #10593 from makinacorpus/cron
cron: better behavior of crontabs tracking
2014-02-20 10:04:59 -07:00
gustavo panizzo
e8aaa86972 run after cloud-init if it's installed 2014-02-20 12:56:14 -03:00
Evan Borgstrom
7ed0eb576e Switch double to single quotes, fix pylint warning 2014-02-20 10:23:57 -05:00
Evan Borgstrom
60e197e184 Adding a shortcut method for accessing Pillar data
Thanks to @erchn for the suggestion in #10517
2014-02-20 10:14:48 -05:00
Pedro Algarvio
4d7c696648 Merge pull request #10618 from techhat/gce
Fixing lint errors in gce driver
2014-02-20 14:29:56 +00:00
Joseph Hall
50b5c08ccd Fixing lint errors in gce driver 2014-02-20 07:25:34 -07:00
Joseph Hall
45ddfe501b Fixing present vs past tense on tags 2014-02-20 07:21:52 -07:00
Joseph Hall
a1fc89bb11 Merge branch 'develop' of https://github.com/erjohnso/salt into erjohnso-develop 2014-02-20 07:16:32 -07:00
Steve Bennett
b2214fc14b Clarify semantics of source, name and args as per https://github.com/saltstack/salt/issues/10492 2014-02-20 23:20:36 +11:00
techdragon
4228630f14 ignore sublime text project files like other IDEs 2014-02-20 19:23:43 +08:00