Commit Graph

25885 Commits

Author SHA1 Message Date
rallytime
f14469bb77 small lint fix 2014-02-11 14:24:10 -07:00
rallytime
555049dd37 More dig tests 2014-02-11 14:19:16 -07:00
Mike Place
441c36f969 Update the footer to align with new .com site. 2014-02-11 14:13:12 -07:00
Colton Myers
992b6772a4 Merge pull request #10359 from techhat/cloudcache
Allow salt cloud to start maintaining its own cachedir
2014-02-11 13:16:32 -07:00
Joseph Hall
8aae7453bb Clarify docstring for pem_finger() 2014-02-11 13:12:48 -07:00
Joseph Hall
5064f4921d Allow salt cloud to start maintaining its own cachedir 2014-02-11 13:05:40 -07:00
Xavier Barbosa
cbe04b8231 add sequence filter for jinja 2014-02-11 20:42:40 +01:00
Pedro Algarvio
9784f649a3 Remove unnecesary parens and format() call 2014-02-11 19:21:02 +00:00
Pedro Algarvio
e3f568e96c Do additional preparation in a separate method.
This way we always call the parent class `__init__` and PyLint does not
complain about it.
2014-02-11 19:21:02 +00:00
Pedro Algarvio
4c6f382adf No short variable names. 2014-02-11 19:20:55 +00:00
Thomas S Hatch
0d636bac7c Merge pull request #10353 from cvrebert/patch-1
Fix references to masterapi in daemons.ioflo.master
2014-02-11 12:15:54 -07:00
Thomas S Hatch
4a1705a306 Merge pull request #10356 from SmithSamuelM/sam_raet_1
Sam raet 1
2014-02-11 12:15:35 -07:00
Mike Place
c869ce6319 Merge pull request #10357 from rallytime/dig_test
Wrote more Dig tests
2014-02-11 12:10:23 -07:00
rallytime
f14be24245 remove print statements 2014-02-11 12:06:35 -07:00
Joseph Hall
9952b4ba34 Merge pull request #10354 from cvrebert/patch-2
auth.pki.auth(): fix caps in ref to Crypto.Util
2014-02-11 12:04:10 -07:00
Joseph Hall
3f07493c36 Merge pull request #10355 from mgwilliams/lxc
lxc module: use spaces, not tabs
2014-02-11 11:59:49 -07:00
Nicole Thomas
9c0016a68f More tests on dig.py and found a bug in check_ip function (ipv6 regex) 2014-02-11 11:59:18 -07:00
Samuel M Smith
b20f552f3f Merge remote-tracking branch 'upstream/develop' into sam_2014_02_03
Conflicts:
	salt/transport/road/raet/packeting.py
	salt/transport/table/test/test_table.py
2014-02-11 11:50:35 -07:00
Matthew Williams
e80b25cc64 lxc module: use spaces, not tabs 2014-02-11 13:42:57 -05:00
Samuel M Smith
870a0ccd8c basic stack functionality 2014-02-11 11:42:10 -07:00
Chris Rebert
9a31ea8019 auth.pki.auth(): fix caps in ref to Crypto.Util
************* Module salt.auth.pki
salt/auth/pki.py:91: [E1101(no-member), auth] Module 'Crypto' has no 'util' member
2014-02-11 10:24:15 -08:00
Chris Rebert
a6353e0cef Fix references to masterapi in daemons.ioflo.master
************* Module salt.daemons.ioflo.master
salt/daemons/ioflo/master.py:63: [E1101(no-member), RemoteMaster.postioinit] Module 'salt' has no 'masterapi' member
salt/daemons/ioflo/master.py:96: [E1101(no-member), LocalMaster.postioinit] Module 'salt' has no 'masterapi' member
2014-02-11 10:20:19 -08:00
Joseph Hall
215372eeed Merge pull request #10352 from cvrebert/patch-1
Avoid shadowing outer info() func in modules.lxc.list_()
2014-02-11 11:18:07 -07:00
Chris Rebert
ffd8ea9043 Avoid shadowing outer info() func in modules.lxc.list_()
************* Module salt.modules.lxc
salt/modules/lxc.py:292: [W0621(redefined-outer-name), list_] Redefining name 'info' from outer scope (line 468)
2014-02-11 10:15:13 -08:00
Pedro Algarvio
ae1d23abb1 Merge pull request #10347 from terminalmage/fix-centos-pkg-tests
Fix pkg test with dots in filename
2014-02-11 18:09:14 +00:00
Erik Johnson
98bcd26139 Fix pkg test with dots in filename
The package here is much smaller and should install quicker than the old
one.
2014-02-11 11:22:34 -06:00
Bruno Binet
e537a0f1f4 minion connection timeout is too small
when network is slow (e.g. 3g connection), minions in multi-master mode fail
to connect: the timeout of 1sec expires before the connection can be
established.
2014-02-11 18:17:44 +01:00
Pedro Algarvio
4d742cc60e Merge pull request #10344 from terminalmage/9895
Fix missing split
2014-02-11 16:42:16 +00:00
Thomas S Hatch
8ce74e0378 disable dot test, need to find another package 2014-02-11 09:41:10 -07:00
Erik Johnson
39349bf690 Fix missing split
Good catch @s0undt3ch:

10d9af9742 (diff-b47e2d68762ff7826be85833f119061fR59)
2014-02-11 10:33:07 -06:00
Nicole Thomas
d02ba6e3aa Spelling and typos. 2014-02-11 09:15:57 -07:00
Pedro Algarvio
68b1af1f37 Merge pull request #10328 from mbarrien/archive-env
Use environment for archive.extracted. Fixes #10324.
2014-02-11 13:15:32 +00:00
zheng1
170a475232 add support to config azure management_host
Because china azure management_host isn't 'management.core.windows.net'.
2014-02-11 20:35:58 +08:00
Michal Bicz
6ad4415ac1 blockdev state, module and test 2014-02-11 00:11:29 -08:00
halfss
14fb688054 bug: syndic does not return in 1 seconds
if syndic not return in 1 seconds after master's minion returned, the raw will be None, so the syndic's minions return could not be display
2014-02-11 15:12:38 +08:00
Damian Myerscough
a30a9ddf43 Unhandled exception in salt-run #9750 2014-02-10 22:36:33 -08:00
A.J. Welch
7cc894e194 Ensure master_port in minion config matches ret_port in master config if running a dev version of salt on non-default ports. 2014-02-11 05:10:26 +00:00
Thomas S Hatch
e199be25f4 finish initial salt-key backend for raet communication 2014-02-10 21:00:35 -07:00
pengyao
48a6d4ecba fixed linux nic name match
linux network interface name can have hyphen strings
2014-02-11 11:03:16 +08:00
Michael Barrientos
fceee539c5 Use environment for archive.extracted. Fixes #10324. 2014-02-10 18:43:07 -08:00
Thomas S Hatch
5d6939278b Merge pull request #10326 from terminalmage/9895
Add suse-specific pkg metadata parser
2014-02-10 19:11:52 -07:00
Thomas S Hatch
e0467c253d Merge pull request #10325 from s0undt3ch/hotfix/revert-reuse-channels
revert reuse channels
2014-02-10 19:11:25 -07:00
Erik Johnson
10d9af9742 Add suse-specific pkg metadata parser
This fixes binary package name detection on Suse, since Suse doesn't do
pkgname.version for package names.
2014-02-10 18:48:12 -06:00
Thomas S Hatch
724a409610 Start work on raet key management 2014-02-10 17:45:21 -07:00
Pedro Algarvio
e89fff84ed Revert "Reuse channels"
This reverts commit 2c0a878a06.
2014-02-10 23:27:40 +00:00
Pedro Algarvio
5a92decfd9 Revert "Update comment"
This reverts commit 22df6a69b3.
2014-02-10 23:27:31 +00:00
Thomas S Hatch
95ddb4eeae Merge pull request #10323 from rallytime/dig_test
Dig tests
2014-02-10 15:44:47 -07:00
Mike Place
c99449c0f6 Remove whitespace 2014-02-10 15:43:57 -07:00
Mike Place
6259f55a4c Dig tests 2014-02-10 15:38:14 -07:00
Seth House
9a702c334c Change the top <h1> wording on our index page
This is an experimental change to poke at issue #8351.
2014-02-10 15:23:47 -07:00