Colton Myers
27c73e2a77
Sort 'comps' and 'line' when comparing Debian repos, Fix #5517
2013-07-25 17:10:21 -06:00
Colton Myers
2826fc6503
Fix some formatting (line length)
2013-07-25 15:49:50 -06:00
Erik Johnson
a52773e940
Merge pull request #6316 from terminalmage/docstring-tweaks
...
Update mysql docstrings to reflect new features
2013-07-25 14:17:30 -07:00
Erik Johnson
ed6047c971
Update mysql docstrings to reflect new features
2013-07-25 16:16:13 -05:00
Pedro Algarvio
148eba6aef
Merge pull request #6310 from EvaSDK/develop
...
Fix compatibility with older virtualenv revision, Fixes : #6309
2013-07-25 06:57:44 -07:00
Gilles Dartiguelongue
a2b01576a8
Fix compatibility with older virtualenv revision, closes : #6309
2013-07-25 15:34:59 +02:00
Thomas S Hatch
ea98ba74b7
Merge pull request #6305 from terminalmage/issue5910
...
Fix minion traceback when pillar SLS is malformed
2013-07-24 22:44:39 -07:00
Erik Johnson
a36546e5b2
Fix minion traceback when pillar SLS is malformed
...
When pillar data is rendered for use by pillar.get, SLS that does not
render to a dictionary results in a traceback on the minion. This commit
resolves that traceback.
Fixes #5910 .
2013-07-24 22:51:35 -05:00
Joseph Hall
66de441abf
Merge pull request #6304 from terminalmage/issue6299
...
yum: Allow 32bit pkgs in arches other than i686
2013-07-24 19:06:40 -07:00
Erik Johnson
aae8ff2ee7
yum: Allow 32bit pkgs in arches other than i686
...
The yum providers previously only supported 32bit packages that were for
the i686 architecture. This adds support for any iX86 arch.
Fixes #6299 .
2013-07-24 20:49:51 -05:00
David Boucha
604a387f0c
Merge pull request #6302 from UtahDave/develop
...
Add missing colons in docstrings
2013-07-24 16:23:23 -07:00
Joseph Hall
a436fea882
Merge pull request #6301 from cvrebert/patch-3
...
Presumable fix for what's breaking Travis
2013-07-24 16:23:18 -07:00
David Boucha
ff3a3234ce
Add missing colons in docstrings
2013-07-24 17:22:38 -06:00
Chris Rebert
4141007511
Presumable fix for what's breaking Travis
...
************* Module salt.ssh
E0602:261,45:Single.highstate_seed: Undefined variable 'target'
2013-07-24 15:37:41 -07:00
Thomas S Hatch
da46fc6605
Add file.missing state
2013-07-24 10:02:17 -06:00
Thomas S Hatch
a8148a1558
Merge pull request #6296 from felskrone/cmditernoblock_pass_on_tgt
...
cmd_iter_no_block did not pass on tgt to get_iter_returns(). That makes ...
2013-07-24 08:44:53 -07:00
Joseph Hall
4375595b16
Merge pull request #6295 from s0undt3ch/hotfix/pip-tests
...
Test if `--pre` option argument ends up in the resulting command line for `pip.install`
2013-07-24 05:51:40 -07:00
Pedro Algarvio
bb4d593b5f
Return an empty dictionary instead of ret which is not yet defined at this stage.
2013-07-24 08:54:32 +01:00
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
Pedro Algarvio
98c63b9671
Test if --pre option argument ends up in the resulting command line for pip.install.
2013-07-24 08:03:50 +01: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
