Chris Rebert
c70760c5fc
win_path: fix pylint errors to fix Travis
2013-07-21 14:02:17 -07: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
Thomas S Hatch
ac8264d4d0
don't require mskpack in local/thin mode
2013-07-20 22:35:48 -06:00
Erik Johnson
38b2e3c991
Add example of watch requisite
2013-07-20 23:25:22 -05:00
Thomas S Hatch
92379fffab
Return error when can't handle deployment of salt-thin
2013-07-20 21:57:57 -06:00
Thomas S Hatch
2ee797c4b2
Detect the roster location better
2013-07-20 21:44:02 -06:00
Thomas S Hatch
b93369d334
Merge pull request #6233 from johnnoone/jinja-import-yaml
...
Jinja import yaml
2013-07-20 19:55:54 -07:00
Erik Johnson
7a9d79a62f
Merge pull request #6247 from terminalmage/docs
...
Improve walkthrough
2013-07-20 19:15:42 -07:00
Erik Johnson
a5627b0cc7
Tweak description of "id" minion config param
2013-07-20 21:14:59 -05:00
Erik Johnson
60faa582f8
Improve walkthrough
...
Several formatting changes, including links to function documentation
where appropriate. Also reworded a bit and added some additional
sections, including an example of how to verify a minion's public key
before accepting it, as requested in #6245 .
2013-07-20 21:10:17 -05:00
Thomas S Hatch
1bb60ff65d
Merge pull request #6243 from s0undt3ch/hotfix/docs-fix
...
Reclass and virtualenv docs fix
2013-07-20 18:56:13 -07:00
Thomas S Hatch
eefb73d172
Merge pull request #6242 from s0undt3ch/hotfix/replace-kwargs-with-a-proper-deprecation
...
Properly deprecate `check_dns`
2013-07-20 18:55:22 -07:00
Thomas S Hatch
b16d7faa12
Merge pull request #6244 from UtahDave/stormpath
...
Add Stormpath external authentication
2013-07-20 11:48:51 -07:00
David Boucha
2fb7911bc6
Fix docstring
2013-07-20 12:37:09 -06:00
David Boucha
ff57e31a8a
Add Stormpath external_auth
2013-07-20 12:34:42 -06:00
Pedro Algarvio
09671fe759
Moved deprecation documentation to it's own document under topics/development
2013-07-20 19:18:55 +01:00
Pedro Algarvio
03f09eb99c
Updated documentation since virtualenv module and state module were renamed to virtualenv_mod.
2013-07-20 18:59:49 +01:00
Pedro Algarvio
7298180379
Fix rst formatting for the reclass tops and pillar modules.
2013-07-20 18:59:49 +01:00
Pedro Algarvio
e38287f25e
Document the deprecation procedure to follow and how to use the helper class.
2013-07-20 18:19:50 +01:00
Pedro Algarvio
df5ab04100
Marked specific places which need code removal on salt >= 0.18
2013-07-20 16:31:28 +01:00
