Mike Place
05b8d3d50c
Merge pull request #8274 from slav0nic/patch-1
...
fix grammar in salt.renderers.jinja.rst
2013-11-05 08:30:03 -08:00
Sergey
2da8e454e7
fix grammar in salt.renderers.jinja.rst
2013-11-05 18:28:21 +02:00
Pedro Algarvio
96ef8f7522
Remove stray print
2013-11-05 15:15:39 +00:00
Joseph Hall
53d6080ee5
Merge pull request #8268 from s0undt3ch/develop
...
Correctly detect a git checkout. Refs #8090 . Fixes #8266 .
2013-11-05 04:12:18 -08:00
Pedro Algarvio
783d0fdcf1
Correctly detect a git checkout. Refs #8090 . Fixes #8266 .
...
The problem is that when we `exec()` the version code from `setup.py`, the `__file__` paths changed and we were "missing" the `.git` directory.
2013-11-05 11:27:06 +00:00
Joseph Hall
ae5cbfd0dc
Merge pull request #8265 from s0undt3ch/develop
...
Stop the `__virtualname__` deprecation warning. Fixes #8221 .
2013-11-05 03:15:28 -08:00
Seth House
0683224e10
Added an explanation of grains.filter_by and the merge kwarg to formula
...
Fixes #8239
2013-11-04 23:23:13 -08:00
Seth House
82c1f392e1
Updated Dash URL for https
2013-11-04 22:50:01 -08:00
Joseph Hall
f2c2c13d04
Merge pull request #8255 from aboe76/develop
...
updated salt spec file for 0.17.1
2013-11-04 16:47:43 -08:00
Joseph Hall
e93faae1b6
Merge pull request #8256 from cachedout/sys-shutdown
...
Modify system shutdown command.
2013-11-04 16:45:03 -08:00
Pedro Algarvio
4a924618af
Merge pull request #8258 from terminalmage/issue8205
...
Fix --output-file CLI argument
2013-11-04 15:57:35 -08:00
Erik Johnson
f06a49eed7
Remove existing output file if present
...
This saves the use of a filehandle by simply removing the file instead
of truncating it. when salt.output.display_output comes along to append
to the file, it will be created if it does not already exist.
2013-11-04 17:55:28 -06:00
Pedro Algarvio
1d35d49288
Stop the __virtualname__
deprecation warning. Fixes #8221 .
2013-11-04 23:47:02 +00:00
Erik Johnson
4818d335eb
Fix --output-file CLI argument
...
This commit fixes it so that the file in not overwritten each time a
minion returns information. Fixes #8205 .
2013-11-04 17:46:36 -06:00
Niels Abspoel
47b6a803e2
updated salt spec file for 0.17.1
...
disabled unit testing until next version broken with salt-testing 0.5.2
2013-11-04 22:55:08 +01:00
Colton Myers
f4d8045419
Merge pull request #8246 from multani/fix/8094-ls-remote-use-ssh-key
...
State git.latest's "ls-remote" step uses the specified SSH key
2013-11-04 10:55:52 -08:00
Joseph Hall
6540c4bc99
Merge pull request #8244 from scottp-dpaw/develop
...
Minor compatibility fixes for bootstrap_psexec
2013-11-04 03:52:02 -08:00
Jonathan Ballet
00bcf65576
git: use the new git.ls_remote function
...
The interface of this function is similar to the other Salt Git's functions
and it uses the 'identity' settings which is set in the state.
Fixes #8094
2013-11-04 12:49:33 +01:00
Jonathan Ballet
ab4698e873
git: new git.ls_remote
with similar interface than other Git functions
...
Inspired from salt.states.git.__ls_remote__, which it aims to replace.
2013-11-04 12:47:34 +01:00
scottp-dpaw
a4e2da664e
Minor compatibility fixes for bootstrap_psexec
2013-11-04 15:16:16 +08:00
Pedro Algarvio
4a6baf0f07
Fix pylint
2013-11-03 20:14:11 +00:00
Joseph Hall
6c5935459e
Merge pull request #8237 from s0undt3ch/develop
...
Some minor fixes
2013-11-03 12:08:02 -08:00
Pedro Algarvio
2a62b73839
Add some more known state internal keywords.
2013-11-03 20:06:23 +00:00
Pedro Algarvio
f6a2f8e9da
Double to single quotes.
2013-11-03 20:06:00 +00:00
Pedro Algarvio
94e1825bd9
Ignore known salt internal arguments.
2013-11-03 20:05:53 +00:00
Pedro Algarvio
56cb07fab4
There won't be a Salt 0.19.0
.
2013-11-03 20:05:45 +00:00
Pedro Algarvio
149a78aa2d
Properly handle requirements files not found.
...
If a requirements file is not found, the `pip` salt module does not even execute the `cmd` call, so, there's not `retcode`, `stdout` or `stderr`.
2013-11-03 20:05:36 +00:00
Pedro Algarvio
fc47a513ba
Skip known state internal keys.
2013-11-03 20:04:36 +00:00
Pedro Algarvio
1f183d8c0e
There won't be a Salt 0.20.x
.
2013-11-03 20:04:15 +00:00
Erik Johnson
3e7f48dd2c
Clarify grains precedence
...
Resolves #8107 .
2013-11-03 13:31:01 -06:00
Pedro Algarvio
5ea0ca12b1
Merge pull request #8231 from pass-by-value/yaml_dump_change
...
Change to yaml.dump
2013-11-03 02:43:48 -08:00
Aditya Kulkarni
c9704f5bd3
Change to yaml.dump
2013-11-03 07:28:56 +00:00
Erik Johnson
09518d13ac
Fix versionadded directives
...
Use 0.14.0 instead of 0.14, for consistency.
2013-11-02 21:14:36 -05:00
Pedro Algarvio
200fa5d976
Update the Transifex translations sources.
2013-11-02 19:49:40 +00:00
Seth House
6725558738
Move image out of the theme folder to quiet sphinx warning
2013-11-02 11:54:37 -06:00
Joseph Hall
1b10464e3f
Merge pull request #8229 from techhat/typo
...
Typo fixes
2013-11-01 21:16:51 -07:00
Joseph Hall
354cb4bb47
Updating capitalization
2013-11-01 22:14:39 -06:00
Joseph Hall
d1bc681332
Typo fix
2013-11-01 22:12:59 -06:00
Erik Johnson
759969985c
Improve documentation regarding nested dict YAML indentation
2013-11-01 23:02:29 -05:00
Erik Johnson
686d475b26
Merge pull request #8228 from sijis/docs_modules_rpm
...
fixed typo in rpm module documentation
2013-11-01 20:26:55 -07:00
Sijis Aviles
b9a2e45b6d
fixed typo in rpm module documentation
2013-11-01 21:40:42 -05:00
Thomas S Hatch
b0df9881db
Add initial hooks to pass config values to individual minion executions
...
This starts with setting the root_dir to be running under the
tmp code directory. This completely isolates all filesystem calls to the
tmp code directory.
2013-11-01 18:08:40 -06:00
Thomas S Hatch
c44f47e2ea
Add functions to wheel api for auto key generation and acceptance
...
This allows for the api to call for keys to be generated cleanly
and accepted. This should make integrating salt with provisioning
tools much easier
2013-11-01 18:08:40 -06:00
Pedro Algarvio
fc8887337d
Merge pull request #8223 from cachedout/silence-postgres-pylint
...
Silence Pylint warning.
2013-11-01 14:49:16 -07:00
Mike Place
31ee0706ef
Silence Pylint warning.
2013-11-01 15:46:59 -06:00
Mike Place
7ae51795a1
Modify system shutdown command.
...
New flag to shutdown at a given time. Refs #7833 .
2013-11-01 15:00:21 -06:00
Colton Myers
d14aa584e6
Merge pull request #8220 from cachedout/warn-on-reap
...
Skip malformed files during reaping. We can just as easily catch them th...
2013-11-01 13:13:21 -07:00
Colton Myers
8d9f71bd49
Merge pull request #8219 from cachedout/#7755
...
#7755 More aggressive re-try logic
2013-11-01 13:12:45 -07:00
Mike Place
d78afd7ea0
Skip malformed files during reaping. We can just as easily catch them the next time.
2013-11-01 13:41:16 -06:00
Mike Place
2f76cf23b2
Import logging.
2013-11-01 12:42:12 -06:00