Erik Johnson
ce22841d52
Rename pillar.data to pillar.items, add pillar.item
...
This brings function parity between the grains and pillar modules, while
preserving backwards compatibility for pillar.data.
2013-07-22 16:08:57 -05:00
Erik Johnson
a2174397ce
Docstring normalizations, fix single-char variable names
2013-07-22 16:07:39 -05:00
Thomas S Hatch
40fe7c6654
Add python27 basic detection to salt-ssh
2013-07-22 10:47:43 -06:00
Joseph Hall
f71eba362e
Merge pull request #6267 from olgeni/portsnap-docstring
...
Fix docstring for freebsdpkg.refresh_db.
2013-07-22 07:59:51 -07:00
olgeni
4a05ac0d5c
Fix docstring for freebsdpkg.refresh_db.
...
The current code does not support using portsnap at all.
2013-07-22 14:31:35 +02:00
Thomas S Hatch
4a1b3a52b7
Merge pull request #6264 from sitepoint/debian_locales_fix
...
[patch] More reliably fetch locale LANG env
2013-07-21 22:52:17 -07:00
Thomas S Hatch
a2636e8949
fix key issue on older platforms
2013-07-21 23:46:28 -06:00
Thomas S Hatch
64c9dcab27
Add comment to auth key
2013-07-21 23:35:29 -06:00
Adam Bolte
4e0aa45163
More reliably fetch locale LANG env
2013-07-22 15:18:38 +10:00
Thomas S Hatch
15557f7134
clean up auto deploy
2013-07-21 23:06:17 -06:00
Thomas S Hatch
f27efb4a5e
Add initial auto key deploy
2013-07-21 22:56:04 -06:00
Thomas S Hatch
10d3eb6980
ignore psudo-terminal errors
2013-07-21 22:02:54 -06:00
Thomas S Hatch
f07834075c
Add better error reporting to salt-ssh
2013-07-21 21:50:40 -06:00
Erik Johnson
44799f2aa0
Merge pull request #6263 from terminalmage/docs
...
Make templating notes flow better with renderer docs
2013-07-21 14:59:39 -07:00
Erik Johnson
e28f8bcf65
Make templating notes flow better with renderer docs
...
Did not realize that renderers are mentioned a few paragraphs before the
section I added in 8c3cb95
. This commit moves that data up to the
section describing the renderers.
2013-07-21 16:57:12 -05:00
Erik Johnson
5d4e54398d
Merge pull request #6262 from terminalmage/docs
...
Add note RE: templating to "starting states" doc
2013-07-21 14:15:20 -07:00
Joseph Hall
1df309a700
Merge pull request #6261 from cvrebert/patch-3
...
win_path: fix pylint errors to fix Travis
2013-07-21 14:02:59 -07:00
Chris Rebert
c70760c5fc
win_path: fix pylint errors to fix Travis
2013-07-21 14:02:17 -07:00
Erik Johnson
8c3cb95d84
Add note RE: templating to "starting states" doc
2013-07-21 15:58:37 -05:00
Thomas S Hatch
020d84615a
Merge pull request #6260 from hulu/win_path-copyedit
...
copyedit win_path messages & docstrings
2013-07-21 13:54:06 -07:00
Chris Rebert
76abd0dc35
copyedit win_path messages & docstrings
2013-07-21 13:52:05 -07:00
Thomas S Hatch
e2e5367d1e
Merge pull request #6259 from terminalmage/issue6246
...
Fix handling of lsb_release info in Debian
2013-07-21 13:03:56 -07:00
Erik Johnson
f4c4e2ecd4
Fix handling of lsb_release info in Debian
...
Debian's lsb_release.get_distro_information() returns a dict with keys
missing the leading 'DISTRIB_' found in /etc/lsb-release. This causes
the values to be assigned to grains like lsb_id, lsb_release,
lsb_codename, etc. instead of lsb_distrib_id, lsb_distrib_release,
lsb_distrib_codename as the later grains code expects to find. As I am
not sure if this is a change in the return data for
lsb_release.get_distro_information(), this commit should preserve
backwards compatibility by only inserting 'distrib_' into the grain's
name if it was not already present.
2013-07-21 14:18:27 -05:00
Pedro Algarvio
2a4a88447c
Merge pull request #6258 from ranl/win_path
...
fix doc string in module.win_path
2013-07-21 12:10:45 -07:00
Ran Leibman
1e4ec5d51c
fix doc string
2013-07-21 21:57:19 +03:00
Thomas S Hatch
fda45f32e8
Merge pull request #6257 from ranl/win_path
...
module/state to manage Windows System PATH
2013-07-21 10:02:19 -07:00
ran
e9176e1a7f
module/state to manage Windows System PATH
2013-07-21 18:23:09 +03:00
Pedro Algarvio
b3b8fe093e
Merge pull request #6256 from terminalmage/issue6102
...
Strip quotes from osname, osrelease, etc values
2013-07-21 07:39:59 -07:00
Erik Johnson
d1d949a536
Strip quotes from osname, osrelease, etc values
...
This removes the quotes from the values discovered in
platform.linux_distribution, as they interfere with OS detection.
2013-07-21 09:16:05 -05:00
David Boucha
92e386c72e
Merge pull request #6255 from terminalmage/docs
...
Add example of watch requisite
2013-07-21 06:55:13 -07:00
Joseph Hall
b14e4f9919
Merge pull request #6254 from Crazybus/patch-1
...
Update winrepo documentation
2013-07-21 06:23:25 -07:00
Crazybus
c595f80b92
Update winrepo documentation
...
Added in documentation about how full_name and versions are used when verifying installed packages and how to find this information. Added link to init.sls examples. Updated the information about package upgrades not being supported (now works in the latest version). Updated the 7zip example because it didn't verify correctly when running highstate.
2013-07-21 15:19:00 +02:00
Thomas S Hatch
56cafa9435
Merge pull request #6251 from cvrebert/patch-1
...
utils.thin: os.getcwd(), not os.cwd()
2013-07-20 23:50:55 -07:00
Thomas S Hatch
9623741d09
Merge pull request #6252 from cvrebert/patch-2
...
utils.jinja: rm unused import of salt._compat.string_types
2013-07-20 23:50:38 -07:00
Thomas S Hatch
bc8bfa67b9
don't need to json this data
2013-07-21 00:43:43 -06:00
Thomas S Hatch
79d6c83c5a
don't add host with scp
2013-07-21 00:40:27 -06:00
Thomas S Hatch
441b4aa632
run salt-call out of /tmp for now
2013-07-21 00:39:36 -06:00
Thomas S Hatch
104c9f7808
cmd does not take an arg anymore
2013-07-21 00:12:06 -06:00
Thomas S Hatch
24e3a3d80c
Clean up thin generation
2013-07-21 00:11:16 -06:00
Chris Rebert
635d0439fa
utils.jinja: rm unused import of salt._compat.string_types
...
************* Module salt.utils.jinja
W0611: 20,0: Unused import string_types
2013-07-20 23:05:17 -07:00
Chris Rebert
4f44da9fae
utils.thin: os.getcwd(), not os.cwd()
...
************* Module salt.utils.thin
E1101: 48,20:gen_thin: Module 'os' has no 'cwd' member
2013-07-20 23:03:05 -07:00
Thomas S Hatch
94dac0caf1
Add connections into salt-ssh for generated salt-thin
2013-07-20 23:49:23 -06:00
Thomas S Hatch
2a988f3fad
Fix missing period
2013-07-20 23:43:05 -06:00
Thomas S Hatch
7c474fdd02
Merge pull request #6250 from cvrebert/patch-3
...
add @cvrebert to AUTHORS
2013-07-20 22:38:08 -07:00
Thomas S Hatch
1aff34fba2
Merge pull request #6249 from cvrebert/patch-2
...
OutputOptionsWithTextMixIn: copyedit warning message
2013-07-20 22:38:02 -07:00
Thomas S Hatch
cbf8dff9cd
Merge pull request #6248 from cvrebert/patch-1
...
copyedit warn_until() docstring & comment
2013-07-20 22:37:36 -07:00
Thomas S Hatch
8444bce4fb
Add saltutils thin module to generate salt-thin tarball
2013-07-20 23:36:42 -06:00
Chris Rebert
41afb19f4b
add @cvrebert to AUTHORS
2013-07-20 22:13:17 -07:00
Chris Rebert
341cc8a421
OutputOptionsWithTextMixIn: copyedit warning message
2013-07-20 22:01:31 -07:00
Chris Rebert
34cb351ba2
copyedit warn_until() docstring & comment
2013-07-20 21:59:03 -07:00