Pedro Algarvio
2f49373b05
Replace string substitution with string formatting
2014-04-30 22:56:27 +01:00
Pedro Algarvio
8b9b888fd9
Replace string substitution with string formatting
2014-04-30 22:56:27 +01:00
Pedro Algarvio
1d4c435988
Replace string substitution with string formatting
2014-04-30 22:56:27 +01:00
Pedro Algarvio
c14535bc77
Replace string substitution with string formatting
2014-04-30 22:56:27 +01:00
Pedro Algarvio
2d388360cc
Replace string substitution with string formatting
2014-04-30 22:56:27 +01:00
Pedro Algarvio
0df509c7ce
Use proper variable name
2014-04-30 22:56:27 +01:00
Pedro Algarvio
d9b7499ab5
Merge pull request #12436 from UtahDave/develop
...
some pylint fixes. remove extra whitespace and add space after comma
2014-04-30 22:12:54 +01:00
Colton Myers
4385a5ddc0
Merge pull request #12435 from hulu/doc-ref-copyedit
...
copyedit ref docs
2014-04-30 15:10:23 -06:00
David Boucha
18198aa7d1
remove whitespace
2014-04-30 15:09:18 -06:00
Chris Rebert
7d1df94bb1
copyedit ref docs
2014-04-30 14:08:31 -07:00
David Boucha
df0f81e249
add missing comma after ','
2014-04-30 15:08:13 -06:00
David Boucha
2973f1a995
remove whitespace
2014-04-30 15:07:18 -06:00
David Boucha
a5c7250ee4
remove whitespace
2014-04-30 15:06:56 -06:00
Colton Myers
078edce76e
Merge pull request #12434 from hulu/copyediting
...
docs copyediting
2014-04-30 15:02:31 -06:00
Chris Rebert
8af229253f
more copyediting
2014-04-30 13:55:48 -07:00
Joseph Hall
5c0fb2af79
Merge pull request #12430 from dnd/saltify_ssh_port
...
Saltify supports non-default ssh ports
2014-04-30 14:54:07 -06:00
Thomas S Hatch
853ed2bb04
Merge pull request #12433 from UtahDave/develop
...
Update mine on any changes to docker containers
2014-04-30 14:52:55 -06:00
David Boucha
f7ae6eb447
Update mine on any changes to docker containers
2014-04-30 14:42:50 -06:00
Steve Valaitis
a0f3175904
Saltify supports non-default ssh ports
2014-04-30 14:54:13 -05:00
Thomas S Hatch
2ba424596f
Merge pull request #12426 from UtahDave/develop
...
Add option to include Docker host ips
2014-04-30 13:29:22 -06:00
David Boucha
e47b10582b
Add option to include Docker host ips
...
This will a a host dictionary with keys of ipv4 and ipv6.
This will be useful to include in some other functions
2014-04-30 13:21:30 -06:00
Thomas S Hatch
89dda35435
Merge pull request #12424 from hulu/copyediting
...
lots of copyediting
2014-04-30 13:09:00 -06:00
Thomas S Hatch
6a9658bb98
Merge pull request #12423 from whiteinge/doc-mine-args
...
Clarified Salt Mine docs on how to pass arguments
2014-04-30 13:08:33 -06:00
Thomas S Hatch
a33d50cc22
Merge pull request #12418 from cvrebert/patch-2
...
fix typo in states.dockerio.script() docstring
2014-04-30 13:07:34 -06:00
Thomas S Hatch
4b843be50d
Merge pull request #12417 from cvrebert/patch-1
...
fix typo in runners.lxc.init() docstring
2014-04-30 13:07:23 -06:00
Chris Rebert
45981a56f9
lots of copyediting
2014-04-30 12:06:27 -07:00
Thomas S Hatch
39c04fa57b
Merge pull request #12411 from makinacorpus/ff2
...
fix highstate output
2014-04-30 13:06:11 -06:00
Seth House
fe3d6d4630
Clarified Salt Mine docs on how to pass arguments
2014-04-30 13:04:59 -06:00
Thomas S Hatch
606fa9db8d
Merge branch 'steverweber-fix_ddns2' into develop
2014-04-30 13:00:36 -06:00
Thomas S Hatch
65b6d0e005
Merge branch 'fix_ddns2' of git://github.com/steverweber/salt into steverweber-fix_ddns2
...
Conflicts:
salt/config.py
2014-04-30 13:00:26 -06:00
Chris Rebert
5f65491dd9
fix typo in states.dockerio.script() docstring
2014-04-30 11:34:12 -07:00
Chris Rebert
4bef711d2e
fix typo in runners.lxc.init() docstring
2014-04-30 11:32:30 -07:00
Thomas S Hatch
aa8cee3ce3
Merge pull request #12413 from jacksontj/job_cache
...
Make sure to pack the __pillar__ into the renderers
2014-04-30 12:16:41 -06:00
Joseph Hall
cbd1725819
Merge pull request #12415 from pwaller/patch-1
...
Fix link to AWS credential distribution blog post
2014-04-30 11:04:59 -06:00
Peter Waller
237b79ccbc
Fix link to AWS credential distribution blog post
...
The existing link left me feeling confused and unfulfilled. I think that's possibly because it accidentally linked to the previous post in the series. I found the "correct" post by googling for it.
2014-04-30 18:03:18 +01:00
Thomas Jackson
3f766a3927
Make sure to pack the __pillar__ into the renderers
2014-04-30 09:12:10 -07:00
Joseph Hall
253a44f51c
Merge pull request #12414 from whiteinge/doc-salt-mine-ex
...
Add example to Salt Mine docs
2014-04-30 10:06:18 -06:00
Seth House
9dcc8a3eda
Removed version added from Salt Mine docs; other clean up
2014-04-30 09:58:38 -06:00
Seth House
6ce4b953eb
Added a full example to the Salt Mine docs
2014-04-30 09:58:30 -06:00
Joseph Hall
23472d7b72
Merge pull request #12409 from jslatts/s3fs_verify_ssl
...
Adding verify_ssl flag to S3 filesystem
2014-04-30 09:37:13 -06:00
Mathieu Le Marec - Pasquet
2e8fde3ee3
fix highstate output
2014-04-30 17:28:05 +02:00
Pedro Algarvio
283c459e20
Merge pull request #12410 from s0undt3ch/hotfix/jenkins
...
Lint fixes
2014-04-30 16:09:23 +01:00
Pedro Algarvio
cc4f8add2d
Fix white-space issue
2014-04-30 16:08:50 +01:00
Pedro Algarvio
9a20d4f43a
Fix logic
2014-04-30 16:07:23 +01:00
Justin Slattery
6e6303637a
Adding verify_ssl flag to S3 filesystem
2014-04-30 10:58:58 -04:00
Joseph Hall
4f0d00fa1c
Merge pull request #12405 from ranl/salt_cloud_win
...
restart salt-minion after salt-cloud deployment on windows
2014-04-30 08:32:39 -06:00
Pedro Algarvio
14738980f6
Merge pull request #12406 from arthurlogilab/patch-3
...
Update deb_apache module to use __virtualname__
2014-04-30 13:27:39 +01:00
Arthur Lutz
8369bd0c81
Update deb_apache module to use __virtualname__
2014-04-30 14:23:05 +02:00
ranl
43c7530a15
restart salt-minion after salt-cloud deployment on windows
2014-04-30 12:14:04 +03:00
Pedro Algarvio
7278635f28
Don't pip stderr to stdout
2014-04-30 08:39:49 +01:00
