Thomas S Hatch
a7baf5936c
Revert "add sequence filter for jinja"
...
This reverts commit cbe04b8231
2014-02-11 15:59:22 -07:00
Thomas S Hatch
4a68e3b376
Merge pull request #10368 from terminalmage/10087
...
Log 'zfs help' output at debug
2014-02-11 15:46:30 -07:00
Pedro Algarvio
7a071bdf79
Merge pull request #10370 from techhat/azure
...
management_host should be optional
2014-02-11 22:43:08 +00:00
Thomas S Hatch
c6812e6196
Merge pull request #10365 from cachedout/footer
...
Update the footer to align with new .com site.
2014-02-11 15:42:49 -07:00
Joseph Hall
94f70e0804
management_host should be optional
2014-02-11 15:40:32 -07:00
Thomas S Hatch
3cbe200eb1
Merge pull request #10361 from johnnoone/jinja-filter
...
add sequence filter for jinja
2014-02-11 15:38:32 -07:00
Thomas S Hatch
11b29560c8
Merge pull request #10348 from bbinet/fix_short_timeout_issue
...
minion connection timeout is too small
2014-02-11 15:32:02 -07:00
Thomas S Hatch
828d473c65
Merge pull request #10345 from s0undt3ch/hotfix/lint
...
Lint fixes
2014-02-11 15:31:09 -07:00
Thomas S Hatch
4b6992844e
Merge pull request #10340 from zheng1/patch-1
...
add support to config azure management_host
2014-02-11 15:27:42 -07:00
Thomas S Hatch
5239c8b192
Merge pull request #10337 from bemehow/blockdev
...
blockdev state, module and test
2014-02-11 15:25:23 -07:00
Thomas S Hatch
4065bae532
Merge pull request #10336 from halfss/patch-3
...
bug: syndic does not return in 1 seconds
2014-02-11 15:20:24 -07:00
Thomas S Hatch
7cee83f230
Merge pull request #10335 from dmyerscough/develop
...
Unhandled exception in salt-run #9750
2014-02-11 15:14:57 -07:00
Thomas S Hatch
dac00f0c47
Merge pull request #10334 from ajw0100/fix-hacking-doc
...
Ensure `master_port` in minion config matches `ret_port` in master config
2014-02-11 15:14:04 -07:00
Mike Place
06a8ae4fc4
Merge pull request #10369 from rallytime/dig_test
...
all methods in dig.py are tested
2014-02-11 15:11:55 -07:00
Thomas S Hatch
b18c2859c7
Merge pull request #10329 from pengyao/linux_interfaces
...
fixed linux nic name match
2014-02-11 15:11:32 -07:00
Thomas S Hatch
a822717eb8
Merge pull request #10307 from makinacorpus/jinja_in
...
Be sure not to loose any var in case of multi macro inheritance
2014-02-11 15:11:09 -07:00
rallytime
c2f8f2bfa0
all methods in dig.py are tested
2014-02-11 15:07:42 -07:00
Erik Johnson
ce8b798a1a
Log 'zfs help' output at debug
...
This suppresses the output from this command unless the minion is
running in debug mode.
2014-02-11 15:59:48 -06:00
Mike Place
012e4ed900
Merge pull request #10366 from rallytime/dig_test
...
More dig tests
2014-02-11 14:33:17 -07:00
rallytime
446cf9b6d4
code cleanup
2014-02-11 14:30:07 -07:00
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
