Commit Graph

26324 Commits

Author SHA1 Message Date
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
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
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
Erik Johnson
cf3103ff6b Fix jenkins failures:
See the following link for more information:

http://jenkins.saltstack.com/job/salt-pr-lint/1366/violations/#pylint
2014-02-20 04:49:49 -06:00
Erik Johnson
a960cee686 Add glossary to toctree 2014-02-20 04:40:20 -06:00
Erik Johnson
179b721b99 fix missing/unreferenced links 2014-02-20 04:38:04 -06:00
Erik Johnson
630f79ae3c Add recent modules to docs 2014-02-20 04:27:05 -06:00
Thayne Harbaugh
4b67d3c28f Put the SSH defaults in config.py and use them.
Fixes #10604
2014-02-20 03:03:16 -07:00
Erik Johnson
8cceee556e fix sphinx build errors/warnings 2014-02-20 03:47:17 -06:00
Erik Johnson
d306b0d9a2 Add svnfs params to master config docs 2014-02-20 03:21:36 -06:00
Erik Johnson
65ffd78fed Add svnfs mountpoints and per-remote config params
This commit adds the mountpoints and per-remote config params recently
added for gitfs and hgfs. Additionally, it makes the paths for trunk,
branches, and tags configurable, both on a global and per-remote basis.
2014-02-20 02:50:33 -06:00
Erik Johnson
651d79b721 Add new config params 2014-02-20 02:50:33 -06:00
Erik Johnson
c98ba8c8ac gitfs: fix ref to _wait_lock() 2014-02-20 02:50:33 -06:00
Erik Johnson
d1015f9425 hgfs: fix ref to _wait_lock() 2014-02-20 02:50:33 -06:00
Erik Johnson
d5405e70bc Add wait_lock() to fileserver/__init__.py
This is common to both hgfs and gitfs, no need to define it in both.
2014-02-20 02:50:33 -06:00
Erik Johnson
bda7724b20 Rename remote_conf_params -> repo_conf_params
Changed for consistency with the other remote fileserver backends
2014-02-20 02:49:38 -06:00
Thomas S Hatch
7e73499f74 Merge pull request #10601 from terminalmage/opensolaris-os-detection
Fix OS detection for OpenSolaris
2014-02-19 22:28:26 -07:00
Erik Johnson
8f87762d13 Fix regex
My previous commit broke Solaris detection while fixing OpenSolaris.
This fixes that.
2014-02-19 20:12:07 -06:00
Thomas S Hatch
553a4fe10f Merge pull request #10598 from cachedout/2_19_docfix
2 19 docfix
2014-02-19 19:11:12 -07:00
Erik Johnson
da24dc29a3 Fix OS detection for OpenSolaris
This fixes the OS detection for OpenSolaris, allowing it to be properly
recognized and for 'os' and 'osrelease' grains to be set correctly.
2014-02-19 19:58:09 -06:00
Evan Borgstrom
adae60f44a Adding a object interface to the __salt__ dictionary
This is another suggestion from @mgwilliams. It adds an object to the
sls file scope named Salt, which dispatches its attributes to the
__salt__ dictionary.

For example, the following two lines are functionally the same:

    ret = Salt.cmd.run(bar)
    ret = salt['cmd.run'](bar)
2014-02-19 20:38:02 -05:00