Commit Graph

30301 Commits

Author SHA1 Message Date
Audrius Kucinskas
dfcc7a4df6 show_volumes is now a wrapper for describe_volumes and slight mods to describe_volumes 2014-05-08 10:16:12 +03:00
Audrius Kucinskas
595ea31d8d Merge branch 'salt-cloud_ec2_describe_volumes' of github.com:Katafalkas/salt into salt-cloud_ec2_describe_volumes 2014-05-08 09:59:09 +03:00
Joseph Hall
51ad28a4d8 Merge pull request #12619 from techhat/cloudrunner
names is a reserved word in the reactor, use instances instead
2014-05-07 21:54:05 -06:00
Joseph Hall
265f421fc1 names is a reserved word in the reactor, use instances instead 2014-05-07 21:29:57 -06:00
Thomas S Hatch
808bed3052 Merge pull request #12618 from JustinCarmony/saltfile-docs
Updating Salt-SSH docs to include Saltfile
2014-05-07 21:02:23 -06:00
Justin Carmony
e4c2cab1cc Updating docs for Saltfile 2014-05-07 19:53:27 -06:00
Joseph Hall
7f4fb5d96e Merge pull request #12616 from techhat/cloudrunner
Fixing passing kwargs in cloud.create runner
2014-05-07 19:00:23 -06:00
Joseph Hall
a15bf8f8f7 Fixing passing kwargs in cloud.create runner 2014-05-07 18:25:39 -06:00
Thomas S Hatch
b501726fde Merge pull request #12612 from rallytime/typo_fix
Fixed some typos in the loader doc examples
2014-05-07 16:05:14 -06:00
Thomas S Hatch
af58d29ab6 Add initial docs on onchanges and onfail 2014-05-07 16:02:36 -06:00
rallytime
4ce1f08532 Fixed some typos in the loader doc examples 2014-05-07 16:00:33 -06:00
Thomas S Hatch
254637ab9b whitespace 2014-05-07 14:03:27 -06:00
Thomas S Hatch
ef9ccd789f Change most interfaces back to the static loader
This means that the lazy loader si still being used for returners
and should keep the original problem that the lazy loader was created
for clean, btu we have been running into many issues and race conditions
with the lazy loader, particularly inside the state runtime, so we will
keep things on the static loader until there is cause to move them over
2014-05-07 13:49:32 -06:00
Thomas S Hatch
c470970df9 Merge pull request #12605 from ranl/tomcat_temp_war_location
tomcat modules/states: get credentials like config.get
2014-05-07 13:26:44 -06:00
Thomas S Hatch
10eddc7ab6 Merge pull request #12603 from terminalmage/issue12572
Reduce output loglevel for pkg management commands which generate a lot of output
2014-05-07 13:25:26 -06:00
Thomas S Hatch
032da9bdbb clean up unneeded backslash 2014-05-07 13:24:16 -06:00
Thomas S Hatch
d947c80b1a Merge pull request #12606 from bouttier/fixed-cloud-absent
fix: cloud.absent thow error when vm doesn't exist
2014-05-07 13:18:21 -06:00
Erik Johnson
12529fb88a Purge remaining refs to salt.utils.pkg 2014-05-07 13:09:55 -05:00
Erik Johnson
5c07011d65 Remove unnecessary test module 2014-05-07 13:00:33 -05:00
Élie Bouttier
fb35a8c01d fix: cloud.absent thow error when vm doesn't exist 2014-05-07 19:31:38 +02:00
Joseph Hall
259503bb08 Merge pull request #12594 from nielsek/ports_sys_locale
use system locale for ports installation
2014-05-07 11:29:13 -06:00
Joseph Hall
65f729f6f2 Merge pull request #12602 from ticosax/tweak-timeout
Add new configuration for salt-cloud to tweak connections to the VM
2014-05-07 11:26:09 -06:00
Thomas S Hatch
0bf73811e5 whitespace 2014-05-07 11:25:02 -06:00
Thomas S Hatch
4f4c56d74b Merge pull request #12599 from fivethreeo/patch-2
pass install to custom seed_cmd, simplify code
2014-05-07 11:23:20 -06:00
Colton Myers
3752b35f02 Merge pull request #12604 from rallytime/grains_functionality
Added convert to list functionality to append in grains module
2014-05-07 11:05:59 -06:00
ranl
1d4c7fe38f tomcat module/state typo 2014-05-07 20:04:23 +03:00
ranl
dee2207c1f tomcat module - grab the manager credentials similar to config.get module 2014-05-07 20:02:49 +03:00
Thomas S Hatch
5e14aacb6f Merge pull request #12601 from techhat/cloudrunner
Add create() to cloud runner
2014-05-07 10:55:26 -06:00
Thomas S Hatch
a162276f47 Merge pull request #12596 from ranl/tomcat_temp_war_location
tomcat module: adding temp_war_location argument to war_deployed
2014-05-07 10:48:16 -06:00
Thomas S Hatch
3939a09594 Merge pull request #12591 from ranl/win_nic_names
adding interfaces_names function to win_network module
2014-05-07 10:46:57 -06:00
Thomas S Hatch
fe73133daf Merge pull request #12590 from ranl/win_dns_client_fix
win_dns_client: fix get_dns_servers function
2014-05-07 10:45:47 -06:00
Thomas S Hatch
31c97cd1e8 Merge pull request #12589 from novapost/fix_cmd_batch
Fix eauth default value in Batch and cmd_batch
2014-05-07 10:45:04 -06:00
Thomas S Hatch
cc8c1b4dc5 fix spacing 2014-05-07 10:43:26 -06:00
Thomas S Hatch
ccbfcab777 Merge pull request #12585 from jond64/pkg.verify-ignore_types
Added ignore_types option to pkg.verify ...
2014-05-07 10:41:23 -06:00
Thomas S Hatch
1cbb409bd9 Merge pull request #12584 from terminalmage/shar-updates
Shar updates
2014-05-07 10:40:02 -06:00
Thomas S Hatch
26a486af2a Merge pull request #12544 from basepi/2014.1.4release
Add 2014.1.4 release notes
2014-05-07 10:25:35 -06:00
rallytime
09a84af233 Added convert to list functionality to append in grains module 2014-05-07 10:22:54 -06:00
Erik Johnson
bb3e562b2b Set loglevel for cmds with a lot of output to TRACE 2014-05-07 11:16:29 -05:00
Erik Johnson
b06ac8d401 Set loglevel for cmds with a lot of output to TRACE 2014-05-07 11:15:04 -05:00
Erik Johnson
3542a42812 Set loglevel for cmds with a lot of output to TRACE 2014-05-07 11:14:34 -05:00
Erik Johnson
1a9cf2b68a Set loglevel for cmds with a lot of output to TRACE 2014-05-07 11:13:37 -05:00
Erik Johnson
3bc90efb5d Make rehash() a private function
This is only needed in the middle of other functions, and thus is
useless on the salt CLI. This commit makes it private.
2014-05-07 11:10:50 -05:00
Erik Johnson
86477e146d Set loglevel for cmds with a lot of output to TRACE 2014-05-07 11:09:51 -05:00
Erik Johnson
9f98e02007 Set loglevel for cmds with a lot of output to TRACE 2014-05-07 11:05:45 -05:00
Nicolas Delaby
782420ca9a Add new configuration for salt-cloud to tweak connections to the VM 2014-05-07 18:05:06 +02:00
Erik Johnson
018d82e142 Set loglevel for cmds with a lot of output to TRACE 2014-05-07 11:04:50 -05:00
Erik Johnson
22485b7f32 Set loglevel for cmds with a lot of output to TRACE 2014-05-07 11:00:39 -05:00
Erik Johnson
6a6810de1f Set loglevel for cmds with a lot of output to TRACE 2014-05-07 11:00:34 -05:00
Erik Johnson
aea31bcea3 Make rehash() a private function
This is only needed in the middle of other functions, and thus is
useless on the salt CLI. This commit makes it private.
2014-05-07 10:57:57 -05:00
Erik Johnson
8b341f5afd Set loglevel for cmds with a lot of output to TRACE 2014-05-07 10:56:09 -05:00