Commit Graph

23918 Commits

Author SHA1 Message Date
Joseph Hall
1879f9f26d Don't just throw away call variables anymore in libcloudfuncs 2013-12-13 20:29:01 -07:00
Joseph Hall
a4dada79cc Don't just throw away call variables anymore in ec2 2013-12-13 20:25:14 -07:00
Joseph Hall
78aa4969ad Merge pull request #9257 from techhat/ec2
Allow EC2 to list images based on owner
2013-12-13 18:53:28 -08:00
Joseph Hall
e9f0f2c02e Add one more warning about large amounts of data 2013-12-13 19:52:38 -07:00
Joseph Hall
ddfaffa090 Allow EC2 to list images based on owner 2013-12-13 19:46:38 -07:00
Joseph Hall
9137d3d15d Merge pull request #9256 from techhat/gce
Default tty based on ssh_user on gce
2013-12-13 16:54:30 -08:00
Joseph Hall
3948031459 Default tty based on ssh_user on gce 2013-12-13 17:52:55 -07:00
Pedro Algarvio
f29eaab3a0 Even more set's! 2013-12-14 00:52:39 +00:00
Pedro Algarvio
54c2a4e6c5 Missed some more set occurrences. 2013-12-14 00:46:51 +00:00
Pedro Algarvio
4b7d7c8f62 Merge branch 'develop' of github.com:saltstack/salt into develop 2013-12-14 00:41:01 +00:00
Pedro Algarvio
b7b99a3a06 Let's see if PyLint stops complaining. 2013-12-14 00:40:34 +00:00
Pedro Algarvio
7c2e24e8bb Make it a dictionary, not a set()(py >= 2.7). 2013-12-14 00:35:07 +00:00
Seth House
d158fbefd4 Changed conf-log to conf_log to match the other conf_* roles
@s0undt3ch Hope you don't mind.
2013-12-13 17:34:59 -07:00
Seth House
48f79b1508 Recombinated the combobulator
Shh! No one tell @thatch45 that these have been in the repo for 2.5 years.
2013-12-13 17:34:59 -07:00
Joseph Hall
ec5ee9cea1 Merge pull request #9255 from s0undt3ch/develop
Revert "Use `vt.Terminal` to deploy VM's."
2013-12-13 16:31:40 -08:00
Pedro Algarvio
bddbef60be Revert "Use vt.Terminal to deploy VM's."
This reverts commit 262e787664, only the part were I removed the `tty` passing to the ssh commands.
2013-12-14 00:29:45 +00:00
Thomas S Hatch
5f945e0ed5 Merge pull request #9254 from terminalmage/remove-yumpkg
move yumpkg.py to salt-contrib
2013-12-13 16:21:00 -08:00
Erik Johnson
c88269351b Remove references to yumpkg in documentation 2013-12-13 18:01:34 -06:00
Erik Johnson
005d775e50 move yumpkg.py to salt-contrib
See https://github.com/saltstack/salt-contrib/pull/57 for the
corresponding pull request.
2013-12-13 17:57:36 -06:00
Thomas S Hatch
f20b879b29 Merge pull request #9253 from terminalmage/list-repo-pkgs
Add pkg.list_repo_args to yumpkg5
2013-12-13 15:52:20 -08:00
Erik Johnson
8d305854e8 Add pkg.list_repo_args to yumpkg5
This commit adds a new function to yumpkg5 which allows you list the
packages available in the different repositories. This can be used to
get the repo name and version number to aid in configuring version
pinning in states.

This also changes list_pkgs to use repoquery, since rpm does not support
the REPOID tag in a queryformat string.
2013-12-13 17:46:57 -06:00
Thomas S Hatch
aa29589c18 Merge pull request #9252 from hulu/avoid-shadowing
dockerio state: avoid shadowing running() func
2013-12-13 15:46:15 -08:00
Chris Rebert
e1b29e378a dockerio state: avoid shadowing running() func 2013-12-13 15:39:47 -08:00
Thomas S Hatch
1216169d00 pylint 2013-12-13 16:32:08 -07:00
Thomas S Hatch
0569fd06de pytlint 2013-12-13 16:30:47 -07:00
Thomas S Hatch
e674b5c250 Merge pull request #9251 from hulu/saltenv-env-defaulting-compat-fileclient
add some apparently-missing env/saltenv compatibility code to fileclient
2013-12-13 15:23:36 -08:00
Chris Rebert
caa847303a add some apparently-missing env/saltenv compatibility code to fileclient 2013-12-13 15:18:03 -08:00
Thomas S Hatch
beed6ae506 Merge pull request #9242 from whiteinge/unit-test-wheel-key
Initial stab at integrations tests for wheel modules (starting with the key module)
2013-12-13 15:16:23 -08:00
Thomas S Hatch
bd0bf3c56a Merge pull request #9250 from cvrebert/patch-1
fileclient.py: avoid shadowing file built-in type
2013-12-13 15:15:16 -08:00
Chris Rebert
d23fd16297 fileclient.py: avoid shadowing file built-in type
salt/fileclient.py:362: [W0622(redefined-builtin), Client.list_states] Redefining built-in 'file'
2013-12-13 15:13:27 -08:00
Thomas S Hatch
d075540555 Merge pull request #9249 from cvrebert/patch-4
win_dns_client mod: rm unused import of re
2013-12-13 15:06:07 -08:00
Chris Rebert
c184b44526 win_dns_client mod: rm unused import of re
salt/modules/win_dns_client.py:7: [W0611(unused-import), ] Unused import re
2013-12-13 15:04:41 -08:00
Thomas S Hatch
d87cbc9b9d Merge pull request #9248 from cvrebert/patch-2
win_network mod: rm unused import of re
2013-12-13 15:04:31 -08:00
Pedro Algarvio
c9b3101d17 On the right line!!! 2013-12-13 23:03:57 +00:00
Chris Rebert
56fc0e0b16 win_network mod: rm unused import of re
salt/modules/win_network.py:7: [W0611(unused-import), ] Unused import re
2013-12-13 15:03:27 -08:00
Thomas S Hatch
6b0d33784f Merge pull request #9247 from cvrebert/patch-1
salt.utils.parsers: fix typo in module docstring
2013-12-13 15:03:17 -08:00
Thomas S Hatch
7e68b66996 Merge pull request #9246 from cvrebert/patch-3
cmdmod: rm unused import of operator module
2013-12-13 15:03:05 -08:00
Seth House
7cfaca6ddb Add basic lowdata test for master_call 2013-12-13 16:00:34 -07:00
Seth House
f4ea6c2026 Added integration tests for two functions in the key wheel module 2013-12-13 16:00:19 -07:00
Seth House
932cd9708a Added new TestCase for testing the *Client interfaces 2013-12-13 16:00:19 -07:00
Chris Rebert
71e00f17ff salt.utils.parsers: fix typo in module docstring 2013-12-13 14:56:22 -08:00
Chris Rebert
a8aae4a46a cmdmod: rm unused import of operator module
salt/modules/cmdmod.py:13: [W0611(unused-import), ] Unused import operator
2013-12-13 14:53:02 -08:00
Thomas S Hatch
035c12219c Merge pull request #9244 from cvrebert/patch-1
states.git.latest(): fix bad format call
2013-12-13 14:51:25 -08:00
Thomas S Hatch
4f2099f6b7 Merge pull request #9245 from cvrebert/patch-2
master.py: rm unused import of SaltRunnerError
2013-12-13 14:51:12 -08:00
Chris Rebert
85883b78aa master.py: rm unused import of SaltRunnerError
salt/master.py:54: [W0611(unused-import), ] Unused import SaltRunnerError
2013-12-13 14:49:38 -08:00
Chris Rebert
55ae624b3f states.git.latest(): fix bad format call
salt/states/git.py:272: [E1101(no-member), latest] Instance of 'dict' has no 'format' member
2013-12-13 14:47:42 -08:00
Pedro Algarvio
80e6ba4ae9 Merge pull request #9243 from techhat/atfork
Update docs to reflect pycrypto dependency
2013-12-13 14:46:57 -08:00
Pedro Algarvio
eebbaeae0a Re-add the pylint disable comment 2013-12-13 22:45:52 +00:00
Joseph Hall
c968443508 Update docs to reflect pycrypto dependency 2013-12-13 15:43:24 -07:00
Pedro Algarvio
b5ee40f7d5 Take into account lower PyCrypto versions (<2.1) 2013-12-13 22:42:57 +00:00