Volker Schwicking
36da54246e
cmd_iter_no_block did not pass on tgt to get_iter_returns(). That makes the
...
saltmaster always query ALL minions with saltutil.find_job because
get_iter_returns default to tgt='*'.
2013-07-24 09:10:51 +02:00
Thomas S Hatch
b8dc7f35a4
Merge pull request #6293 from terminalmage/issue6292
...
Limit pkg.latest to 1 refresh per run unless overridden
2013-07-23 23:17:24 -07:00
Thomas S Hatch
3bca9cec38
Merge pull request #6294 from kfdm/extra-grain-functions
...
Add append, remove, and delval to the grains module
2013-07-23 23:16:30 -07:00
Thomas S Hatch
7000ab9d20
Fix #5928
...
@basepi, this needs to be in 0.16.1
2013-07-24 00:07:29 -06:00
Paul Traylor
8fa9bfcade
Add grains.append, grains.remove, and grains.delval methods to the grains module
2013-07-23 21:15:20 -07:00
Erik Johnson
3a95a4d48a
Limit pkg.latest to 1 refresh per run unless overridden
...
This fixes #6292 by moving the rtag check to the call to
pkg.latest_version, and never refreshing if/when pkg.install is run.
2013-07-23 22:35:49 -05:00
Joseph Hall
c487033fe4
Merge pull request #6291 from mafrosis/pip_pre_releases
...
Allow pip to install pre-release versions
2013-07-23 18:37:40 -07:00
mafro
7b72d8907d
Allow pip to install pre-release versions refs pypa/pip@4d5c5f8f
2013-07-24 01:28:53 +00:00
Joseph Hall
bc2c24e366
Merge pull request #6290 from terminalmage/issue6277
...
ssh_auth: detect when source file has 0 valid keys
2013-07-23 18:24:34 -07:00
Joseph Hall
abbcf182de
Merge pull request #6289 from cvrebert/patch-2
...
ssh/__init__.py: fix indentation
2013-07-23 15:56:43 -07:00
Pedro Algarvio
c4e84576c2
Merge pull request #6288 from cvrebert/patch-1
...
couchdb_return: Fix spacing to make pylint happier
2013-07-23 15:39:48 -07:00
Erik Johnson
e2dd93b717
ssh_auth: detect when source file has 0 valid keys
...
If an improperly-formatted file is used as the source file for an
ssh_auth.present state, the state incorrectly reports that all keys in
the file are present. This is because the functions that check the
source file only return keys that need to be changed, and with no valid
keys, there is nothing to change.
This commit detects when there are no valid keys found, and reports this
in the state output.
Additionally, since one of the ways that this edge case can be triggered
is if a public key from PuTTYgen is used, instructions have been added
to the ssh_auth.present docstring explaining how to obtain the
OpenSSH-compatible public key for the corresponding private key
generated by PuTTYgen.
Fixes #6277 .
2013-07-23 17:39:47 -05:00
Chris Rebert
516ddbba6f
ssh/__init__.py: fix indentation
2013-07-23 15:16:32 -07:00
Chris Rebert
c6f0b6820b
couchdb_return: Fix spacing to make pylint happier
2013-07-23 15:14:56 -07:00
Seth House
1ad733a2c0
Added missing 's' in cross-reference
2013-07-23 16:07:03 -06:00
Thomas S Hatch
5e6aee9ee8
Merge pull request #6286 from s0undt3ch/features/intersphinx-python-docs
...
Link to python docs
2013-07-23 13:54:04 -07:00
Pedro Algarvio
bc28a6276b
Link to python's glossary.
2013-07-23 21:45:26 +01:00
Thomas S Hatch
f577ed2837
markupsafe is not needed for older Jinja
2013-07-23 14:44:06 -06:00
Pedro Algarvio
a91b6ae02c
Linked the dictionaries, strings, lists and numbers to the python documentation.
2013-07-23 21:42:33 +01:00
Pedro Algarvio
e23d1febee
The dot does not belong on the linked text.
2013-07-23 21:42:15 +01:00
Thomas S Hatch
bd30ce1c4d
Merge pull request #6272 from robertkeizer/couchdb-returner
...
Couchdb returner
2013-07-23 13:16:55 -07:00
Thomas S Hatch
a010304c86
Merge pull request #6279 from terminalmage/issue6162
...
Fix alternatives.check_installed
2013-07-23 13:12:39 -07:00
Thomas S Hatch
387a74490a
Re-arrange highstate execution routinesfor ssh
2013-07-23 14:08:50 -06:00
Thomas S Hatch
5f8a2a1ce9
Fix error where iteration was breaking too soon
2013-07-23 14:08:50 -06:00
Thomas S Hatch
5eba12dc62
Add error parsing to nb routines
2013-07-23 14:08:50 -06:00
Thomas S Hatch
919178a129
Fix missing cmd string update in nb support
2013-07-23 14:08:50 -06:00
Thomas S Hatch
406657125e
Clean up cmd string passing per non-blocking ssh
2013-07-23 14:08:50 -06:00
Thomas S Hatch
c1e8b750fa
correct yield for cmdexec
2013-07-23 14:08:50 -06:00
Thomas S Hatch
d6f00297bd
call corrent method
2013-07-23 14:08:50 -06:00
Thomas S Hatch
d245101a90
more minor ssh fixes
2013-07-23 14:08:50 -06:00
Thomas S Hatch
3c932d4d85
minor cleanup
2013-07-23 14:08:50 -06:00
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
