Joseph Hall
126f3ae9fe
Merge pull request #12235 from gtmanfred/cloud
...
Minion is not always defined in the profile
2014-04-23 11:46:19 -06:00
Daniel Wallace
1d2fd37ff2
minion is not always defined in the profile
2014-04-23 11:08:01 -05:00
Mike Place
2fbf1975c3
Merge pull request #12233 from terminalmage/wording-tweak
...
Tweak wording for successful orch w/no changes
2014-04-23 09:28:19 -06:00
Erik Johnson
041bda018d
Tweak wording for successful orch w/no changes
...
This changes an awkwardly-worded comment when the state.orchestrate
runner is executed and there are no changes to be made.
2014-04-23 10:20:20 -05:00
Pedro Algarvio
993eb7b670
Merge pull request #12226 from terminalmage/issue9001
...
Pass through arguments in lvs.zero
2014-04-23 15:55:23 +01:00
Pedro Algarvio
343b53cdf5
Merge pull request #12221 from techhat/issue11934
...
Correctly check for a terminated state
2014-04-23 15:01:05 +01:00
Erik Johnson
71013fbc32
Pass through arguments in lvs.zero
...
Fixes #9001 .
2014-04-23 08:55:06 -05:00
Joseph Hall
cbbe347dcd
Correctly check for a terminated state
2014-04-23 07:29:56 -06:00
Joseph Hall
14f2f4ca41
Merge pull request #12220 from Gyroplast/patch-1
...
Fix typo in Type declaration of systemd unit
2014-04-23 07:14:12 -06:00
Joseph Hall
3182395267
Merge pull request #12208 from vexxhost/develop
...
Added documentation for VEXXHOST cloud
2014-04-23 07:12:24 -06:00
Dennis Herbrich
f1a8a538fc
Fix typo in Type declaration of systemd unit
...
The systemd service type must be declared in lower case, otherwise systemd generated a warning and ignores the declaration.
2014-04-23 15:11:00 +02:00
Joseph Hall
cd1104a976
Merge pull request #12215 from makinacorpus/lenny
...
service: support for sarge,lenny
2014-04-23 07:09:14 -06:00
Pedro Algarvio
a564874bb0
Since we now include the code name, check for presence of the commit info instead.
2014-04-23 13:25:43 +01:00
Mathieu Le Marec - Pasquet
4c53cd5dc6
pylint fix
2014-04-23 13:20:55 +02:00
Pedro Algarvio
16d975c691
Merge pull request #12214 from s0undt3ch/hotfix/transifex-updates
...
Hotfix/transifex updates
2014-04-23 12:18:38 +01:00
Mathieu Le Marec - Pasquet
56d15e4493
service: support for sarge,lenny
2014-04-23 12:56:03 +02:00
Jenkins
87a3e74045
Update 'doc/.tx/config' - Build #30
...
http://cookingwithsalt.org/job/salt/job/develop/job/transifex/30/
Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
2014-04-23 11:36:32 +01:00
Pedro Algarvio
68111e2cf9
Remove from list on success.
2014-04-23 11:36:31 +01:00
Pedro Algarvio
014bcc59f2
Merge pull request #12210 from terminalmage/docs
...
Fix bad docstrings
2014-04-23 08:52:54 +01:00
Erik Johnson
18e3933ae8
Fix docstring
2014-04-22 23:51:08 -05:00
Erik Johnson
5ca6a5523a
Fix docstring
2014-04-22 23:51:08 -05:00
Erik Johnson
4beb9d309f
Fix docstring
2014-04-22 23:51:08 -05:00
Erik Johnson
5cbb8f7458
Fix docstring
2014-04-22 23:51:08 -05:00
Erik Johnson
15bfc93541
Fix docstring
2014-04-22 23:51:08 -05:00
Erik Johnson
3e1eab107d
Fix docstring
2014-04-22 23:51:08 -05:00
Erik Johnson
80421a4882
Fix docstring
2014-04-22 23:51:08 -05:00
Erik Johnson
0a89ea4702
Fix docstring
2014-04-22 23:51:08 -05:00
Erik Johnson
04c237604d
Fix docstring
2014-04-22 23:51:08 -05:00
Colton Myers
6ae25cb54d
Merge pull request #12207 from basepi/2014.1.3release
...
Fix 2014.1.3 release notes (index + title)
2014-04-22 19:07:34 -06:00
Colton Myers
c6cad43d45
Fix released version
2014-04-22 19:06:49 -06:00
Colton Myers
4e9ddf2bcb
Fix title of 2014.1.3 release notes
2014-04-22 19:06:11 -06:00
Mohammed Naser
f363338e67
Added documentation for VEXXHOST cloud
...
VEXXHOST provides a public cloud computing service that's based
on OpenStack in Canada.
The following patch provides documentation on how to use
salt-cloud with the VEXXHOST public cloud.
2014-04-22 21:05:03 -04:00
Thomas S Hatch
edcf898966
correctly set up base image rootfs config
2014-04-22 17:39:35 -06:00
Thomas S Hatch
8d5eb80e71
lint
2014-04-22 17:23:39 -06:00
Thomas S Hatch
bb31198b89
Make error messages a little more informative for lxc
2014-04-22 17:22:00 -06:00
Thomas S Hatch
a20d1b0617
Add backing if vgname is defined
2014-04-22 17:19:18 -06:00
Thomas S Hatch
cdc0f480fc
Merge pull request #12204 from terminalmage/docs
...
Split up contributing/development docs
2014-04-22 16:44:08 -06:00
Thomas S Hatch
823b36ecdb
Merge pull request #12202 from cachedout/12199
...
Fix S3 module docs.
2014-04-22 16:42:27 -06:00
Erik Johnson
a76747f780
Split up contributing/development docs
...
This page has become massive and merits being split into two pages.
Also, it affords the opportunity of getting rid of an ambiguous header
name that causes confusion.
Fixes #10830 .
2014-04-22 17:25:58 -05:00
Mike Place
b36e01ef9f
Fix S3 module docs.
...
Closes #12199
2014-04-22 16:15:51 -06:00
Thomas S Hatch
139b8b5389
Merge pull request #12198 from terminalmage/issue11990
...
Remove unused "ports" argument from docker.start
2014-04-22 15:45:54 -06:00
Thomas S Hatch
c4b23604e4
Merge pull request #12197 from cachedout/6947
...
Add function to delete a minion cache with relative safety.
2014-04-22 15:41:28 -06:00
Erik Johnson
49733de57d
Remove unused "ports" argument from docker.start
2014-04-22 16:41:25 -05:00
Mike Place
c1c691209f
Pylint
2014-04-22 15:32:34 -06:00
Thomas S Hatch
1183120813
Merge pull request #12195 from cachedout/12173
...
Don't fire events on module refresh with --local
2014-04-22 15:05:15 -06:00
Mike Place
2ef2266be8
Add function to delete a minion cache with relative safety.
2014-04-22 15:03:46 -06:00
Mike Place
e7188e2c1d
Don't fire events on module refresh with --local
...
Closes #12173
Use .get()
2014-04-22 14:16:27 -06:00
Thomas S Hatch
75f3567992
Merge pull request #12194 from basepi/saltrc12169
...
Change user salt configs to .saltrc from .salt to prevent conflicts
2014-04-22 14:05:37 -06:00
Thomas S Hatch
9b8087d093
Merge pull request #12193 from hulu/ssh-wrapper-state
...
client.ssh.wrapper.state: rename local vars to avoid shadowing
2014-04-22 14:04:49 -06:00
Chris Rebert
f2e152ad9c
client.ssh.wrapper.state: rename local vars to avoid shadowing
...
************* Module salt.client.ssh.wrapper.state
salt/client/ssh/wrapper/state.py:39: [W0621(redefined-outer-name), sls] Redefining name 'high' from outer scope (line 118)
salt/client/ssh/wrapper/state.py:287: [W0621(redefined-outer-name), show_sls] Redefining name 'high' from outer scope (line 118)
salt/client/ssh/wrapper/state.py:314: [W0621(redefined-outer-name), show_top] Redefining name 'top' from outer scope (line 189)
2014-04-22 12:11:40 -07:00
