Commit Graph

22793 Commits

Author SHA1 Message Date
Pedro Algarvio
9767d83e67 salt.cloud.utils is no longer a package. 2013-11-21 20:33:12 +00:00
Pedro Algarvio
eb7c2ef822 Fix references to salt.cloud.config now merged into salt.config. 2013-11-21 20:33:09 +00:00
Pedro Algarvio
928710c112 Remove long deprecated salt.cloud.utils.get_option(). 2013-11-21 20:30:23 +00:00
Pedro Algarvio
b6eeed32de Fix parsers import line since it's now merged. 2013-11-21 20:30:23 +00:00
Pedro Algarvio
2bc40feda7 Merge salt.cloud.utils.parsers into salt.utils.parsers 2013-11-21 20:30:23 +00:00
Pedro Algarvio
2b5061cd91 Merge salt.cloud.version into salt.version. 2013-11-21 20:30:23 +00:00
Pedro Algarvio
2a97759a3e Merged salt.cloud.config into salt.config. 2013-11-21 20:30:23 +00:00
Pedro Algarvio
97249d4b50 Replaced CloudProviderContext usage with salt's func_globals_inject 2013-11-21 20:30:23 +00:00
Pedro Algarvio
d45bbd76f3 Rename state_call_context to func_globals_inject 2013-11-21 20:30:23 +00:00
Pedro Algarvio
15f50502b8 Merge salt.cloud.loader into salt.loader. 2013-11-21 20:30:23 +00:00
Joseph Hall
b4a33bd29b Merge pull request #8716 from jmlowe/fixed-grub-legacy-conf-stanza-newline-parsing
Correctly parse grub.conf stanzas that aren't separated by new lines
2013-11-21 12:02:56 -08:00
Thomas S Hatch
1525f37a5a Merge pull request #8714 from basepi/aptforceyes
Add explicit `force_yes` arg for non-explicit downgrades
2013-11-21 12:02:22 -08:00
Thomas S Hatch
e56e66f586 Merge pull request #8708 from makinacorpus/issue-8707
Feat: Add a prepend_if_not_found arg to file.blockreplace
2013-11-21 11:57:46 -08:00
Joseph Hall
f6c536ac98 Merge pull request #8718 from pass-by-value/doc_changes
Halite install doc changes and add self to authors
2013-11-21 11:48:32 -08:00
Thomas S Hatch
c6cf05e7c4 Merge pull request #8664 from cvrebert/patch-6
gnomedesktop: doesn't seem to make sense for get() to take a `value` arg
2013-11-21 11:46:56 -08:00
Aditya Kulkarni
bd2c07e866 Halite install doc changes and add self to authors 2013-11-21 14:42:31 -05:00
Pedro Algarvio
ae9b367eed Merge pull request #8715 from UtahDave/develop
Properly delete temporary directory and installer on Windows
2013-11-21 11:12:11 -08:00
David Boucha
437b6bec89 only check for keep_temp once 2013-11-21 11:31:15 -07:00
David Boucha
4a25ad7275 Delete installer file first to empty the directory 2013-11-21 11:26:19 -07:00
David Boucha
70b9bf1384 rmdir doesn't have /S flag in smbclient context 2013-11-21 11:23:30 -07:00
Mike Lowe
470f8689e8 Not all distros separate stanzas with new lines, now if in a stanza
and the start of a stanza is detected start a new stanza
2013-11-21 12:52:28 -05:00
Colton Myers
fd3b71be01 Add explicit force_yes arg for non-explicit downgrades
User was using a pin file to define a non-standard repo which may have a
lower version.  Version was not explicitly defined, so the state was not
detecting a downgrade.  Add ability to pass in --force-yes (with
warnings that it could be dangerous).
2013-11-21 10:47:14 -07:00
Pedro Algarvio
98aa0304ef Merge pull request #8700 from s0undt3ch/issues/8653-logstash
Only close existing ZMQ context's. Fixes #8653.
2013-11-21 09:28:01 -08:00
Mathieu Le Marec - Pasquet
50c1235502 add a test for #8707 2013-11-21 12:57:51 +01:00
Mathieu Le Marec - Pasquet
c7b50886df Feat: Add a prepend_if_not_found arg to file.blockreplace
We may also want to add data to the beginning of a file instead of appending to it.

This fixes #8707
2013-11-21 12:36:57 +01:00
Seth House
37711d860b Merge pull request #8706 from bclermont/develop
Add archive.extracted state
2013-11-20 22:33:48 -08:00
Seth House
b3ad876fae Added code-block to example in Django ORM 2013-11-20 22:30:57 -08:00
Bruno Clermont
7190bee9eb add archive state 2013-11-21 14:24:25 +08:00
Erik Johnson
d046253d00 Merge pull request #8673 from hvnsweeting/develop
remove confusing example about order option
2013-11-20 20:59:19 -08:00
Seth House
5f63035e36 Added example of passing Reactor event data through to a state run
Bonus: this example is only a tiny bit convoluted and semi-plausible!
2013-11-20 20:23:31 -08:00
Seth House
32425e7148 Added rST anchor to Salt Mine docs 2013-11-20 20:23:31 -08:00
Joseph Hall
2aba3fd5ae Merge pull request #8704 from techhat/tmpfixup
Fixing up tmp_dir and event_kwargs
2013-11-20 20:12:14 -08:00
Joseph Hall
4fe1593352 Fixing tmp logic 2013-11-20 21:10:30 -07:00
Joseph Hall
be35c75ec9 Make sure that tmp_dir is owned by sudo user 2013-11-20 20:50:25 -07:00
Joseph Hall
228e46c794 Fixing up tmp_dir and event_kwargs 2013-11-20 20:25:12 -07:00
Pedro Algarvio
61aaf78530 Only close existing ZMQ context's. Fixes #8635. 2013-11-20 21:43:00 +00:00
Pedro Algarvio
ba3bd5f6e6 Merge pull request #8697 from s0undt3ch/hotfix/jenkins
PyLint's `disable-msg` is deprecated. Use `disable`.
2013-11-20 11:43:57 -08:00
Pedro Algarvio
7f1e6ceb50 PyLint's disable-msg is deprecated. Use disable. 2013-11-20 19:42:49 +00:00
Pedro Algarvio
b281866090 Merge pull request #8696 from s0undt3ch/hotfix/jenkins
Remove duplicate key and update the default value.
2013-11-20 11:40:43 -08:00
Pedro Algarvio
74c8011bd0 Remove duplicate key and update the default value. 2013-11-20 19:39:49 +00:00
Pedro Algarvio
f10201c848 Merge pull request #8695 from s0undt3ch/hotfix/jenkins
Fix `NameError`'s and backslash.
2013-11-20 11:31:32 -08:00
Pedro Algarvio
447217f009 Fix NameError's and backslash. 2013-11-20 19:30:28 +00:00
Pedro Algarvio
cdaac37010 Merge pull request #8687 from techhat/sanitize
Further sanitize data fired in an event
2013-11-20 11:00:18 -08:00
Pedro Algarvio
9ca9bb447f Merge pull request #8694 from techhat/sudofix
The sudo_password is actually found in kwargs
2013-11-20 10:58:53 -08:00
Joseph Hall
573753386c The sudo_password is actually found in kwargs 2013-11-20 11:57:47 -07:00
Pedro Algarvio
3ffeb256ee Merge pull request #8693 from techhat/cloudtmpdir
Allow tmp_dir to be user-configurable
2013-11-20 10:44:33 -08:00
Joseph Hall
9d64eadbca Actually _allow_ users to define tmp_dir 2013-11-20 11:37:02 -07:00
Joseph Hall
bba9ad7551 Allow tmp_dir to be user-configurable 2013-11-20 11:23:15 -07:00
Colton Myers
3dd63bcebb Merge pull request #8688 from techhat/fixsshuser
Fixing syntax errors with the ssh_user
2013-11-20 10:08:34 -08:00
Joseph Hall
df4fd98953 Fixing syntax errors with the ssh_user 2013-11-20 11:06:46 -07:00