Joseph Hall
70cb950b91
Merge pull request #6282 from cvrebert/patch-3
...
tomcat module: fix indentation
2013-07-23 11:55:08 -07:00
David Boucha
28747ed688
Merge pull request #6281 from cvrebert/patch-2
...
zfs module: add space after comma to help fix Travis
2013-07-23 11:28:48 -07:00
David Boucha
4904de7cd7
Merge pull request #6280 from cvrebert/patch-1
...
win_repo mod: fix doubled-up backslashes in raw docstring
2013-07-23 11:24:52 -07:00
Chris Rebert
cfecdd062f
tomcat module: fix indentation
2013-07-23 11:15:22 -07:00
Chris Rebert
da1d745568
zfs module: add space after comma to help fix Travis
2013-07-23 11:14:33 -07:00
Chris Rebert
5414592898
win_repo mod: fix doubled-up backslashes in raw docstring
2013-07-23 11:13:17 -07:00
Pedro Algarvio
4cf488e983
Link to dictionaries and integers on the python documentation.
2013-07-23 18:43:23 +01:00
Pedro Algarvio
c535854871
Link to the fnmatch and re modules.
2013-07-23 18:31:21 +01:00
Pedro Algarvio
9ab3b7a1df
Link to the fnmatch and re modules.
2013-07-23 18:22:52 +01:00
Pedro Algarvio
0df4f2e8d0
Link to the actual python False constant.
2013-07-23 18:21:01 +01:00
Erik Johnson
497d55d2f6
Fix alternatives.check_installed
...
This function used os.path.realpath(), which follows symlinks
recursively. This means that, when the path for the alternative is also
a symlink, alternatives.check_installed returns False since it follows
the symlinks all the way down to the actual binary.
Additionally, there was redundant code in check_installed() and
show_current(). This commit changes check_installed() so that it uses
show_current() to provide the redundant functionality, and makes
show_current() use os.readlink() instead, so that it only checks the
path to which the link points instead of recursively following symlinks
Fixes #6162 .
2013-07-23 12:17:32 -05:00
Pedro Algarvio
d7cbf107ce
Link dict to the python documentation.
2013-07-23 18:07:58 +01:00
Pedro Algarvio
1ff844dfb6
Link to the datetime python documentation.
2013-07-23 18:03:42 +01:00
Pedro Algarvio
5886ea384d
Link to dictionaries in the python documentation.
2013-07-23 17:59:18 +01:00
Pedro Algarvio
947f99a007
Link to string and False in the python documentation.
2013-07-23 17:55:45 +01:00
Joseph Hall
3848a498f3
Merge pull request #6278 from robertkeizer/zfs_fix
...
Dynamic ZFS function fix.
2013-07-23 09:40:37 -07:00
Robert Keizer
3342480a5a
Removed commented line.
2013-07-23 11:36:43 -05:00
Robert Keizer
22e01b9d95
Got first line of documentation working.
2013-07-23 11:31:38 -05:00
Pedro Algarvio
b83a749d60
Link to the dict on python's typesmapping and point to a docstring explanation.
2013-07-23 17:20:50 +01:00
Pedro Algarvio
e46e81e1f2
Direct link to python's documentation regarding the LogRecord attributes.
2013-07-23 16:59:47 +01:00
Robert Keizer
4a4a33e0e7
Fixed command execution.
2013-07-23 10:57:15 -05:00
Pedro Algarvio
868cfad2d0
Link minion.rst to time.strftime's python documentation.
2013-07-23 16:55:23 +01:00
Pedro Algarvio
70b57bd0a2
Link master.rst to time.strftime's python documentation.
2013-07-23 16:46:05 +01:00
Pedro Algarvio
e7be91fc87
Enable linking directly to python's documentation.
2013-07-23 16:39:55 +01:00
Pedro Algarvio
59632dec56
One more fix to the win_repo module.
2013-07-23 15:46:50 +01:00
Joseph Hall
a70368e506
Merge pull request #6275 from ranl/develop
...
fixing deploy_war function on windows
2013-07-23 07:31:54 -07:00
ran
b6818bd73c
fixing deploy_war function on windows
2013-07-23 17:26:55 +03:00
Pedro Algarvio
3319f3aadf
Fix pylint regarding win_repo.
2013-07-23 12:39:28 +01:00
Pedro Algarvio
2ac0d57c42
Merge pull request #6273 from UtahDave/develop
...
Add winrepo module for managing a Windows package repo on a Standalone Minion
2013-07-23 04:38:22 -07:00
David Boucha
7d733de876
Correct CLI example in the docstring
2013-07-23 02:39:11 -06:00
David Boucha
023383e53f
Add winrepo module
...
Allows for managing a Windows package repo on a standalone
Windows minion
2013-07-23 02:37:20 -06:00
Thomas S Hatch
f18603fa61
Set up initial parallel ssh jobs
2013-07-22 23:09:48 -06:00
Thomas S Hatch
7c0fe51558
Add non-blocking commands for shell backend
2013-07-22 23:09:48 -06:00
Joseph Hall
605b5d2876
Merge pull request #6271 from terminalmage/issue5061
...
Rename network.hwaddr to network.hw_addr
2013-07-22 21:20:39 -07:00
Joseph Hall
f4c4368403
Merge pull request #6270 from pgexperts/develop
...
lsb_codename has been changed to lsb_distrib_codename, so we need to upd...
2013-07-22 21:20:15 -07:00
Robert Keizer
9700e7a966
Merge branch 'develop' into couchdb-returner
2013-07-22 22:22:48 -05:00
Robert Keizer
8409f319b5
Got same output for cached and couchdb query.
2013-07-22 22:19:06 -05:00
Robert Keizer
baf615569d
Starting to handle 404 not founds.
2013-07-22 22:08:29 -05:00
Robert Keizer
a857d0b76f
Got get_jid executing. Turns out needs to be in disk-packages/salt/returners rather than /src/salt/_returners
2013-07-22 22:04:15 -05:00
Erik Johnson
50b34955c3
Rename network.hwaddr to network.hw_addr
...
This also adds the aliases network.hwaddr, as well as network.ipaddrs
and network.ipaddrs6. Fixes #5061 .
2013-07-22 21:52:52 -05:00
Jeff Frost
fa03e25e83
lsb_codename has been changed to lsb_distrib_codename, so we need to update the apt use of that grain otherwise we get a key error
2013-07-22 19:22:16 -07:00
Thomas S Hatch
5ac51cd64e
Handle non "local" salt-call returns
2013-07-22 19:40:50 -06:00
Robert Keizer
ee6ed0034a
Some documentation and sanity checks. Also working at getting get_jid and get_jids to work. No luck yet.
2013-07-22 20:07:48 -05:00
Joseph Hall
f62771a227
Merge pull request #6268 from terminalmage/issue6127
...
Function parity between pillar and grains modules
2013-07-22 14:15:48 -07:00
Erik Johnson
f863417790
Update references to pillar.data in docs
2013-07-22 16:09:51 -05:00
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
Seth House
a72913a012
Fixed two rST cross-reference syntaxes for the virt tutorial
2013-07-22 14:49:02 -06:00
Seth House
24723629be
Fixed rST cross-reference syntax in two tutorials
2013-07-22 14:35:49 -06:00
Thomas S Hatch
b0b9d2fbe2
ignore warning about adding to known hosts
2013-07-22 14:19:18 -06:00
