26131 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Thomas S Hatch	7af0a90d95	Update the packaging conventions doc	2014-02-11 21:35:27 -07:00
Thomas S Hatch	30b3b602e7	Merge pull request #10371 from s0undt3ch/hotfix/lint ... Lint Fixes	2014-02-11 16:50:19 -07:00
Thomas S Hatch	7e4c781fe9	Revert "Do additional preparation in a separate method." ... This reverts commit e3f568e96c.	2014-02-11 16:48:35 -07:00
Thomas S Hatch	c0783c02fb	Merge pull request #10372 from basepi/preseeddocs9997 ... Fix insecure recommendations in preseed tutorial, Fix #9997	2014-02-11 16:42:33 -07:00
Colton Myers	7b493bb024	Remove trailing whitespace from preseeding tutorial	2014-02-11 16:24:40 -07:00
Colton Myers	f1654b67a5	Fix insecure recommendations in preseed tutorial, Fix #9997	2014-02-11 16:24:15 -07:00
Pedro Algarvio	3391ce00af	White-space related lint fixes.	2014-02-11 23:12:40 +00:00
Pedro Algarvio	ece3b06c4c	White-space related lint fixes.	2014-02-11 23:04:33 +00:00
Pedro Algarvio	b69fbe4cbf	White-space related lint fixes.	2014-02-11 23:03:24 +00:00
Pedro Algarvio	cc0393b1fb	White-space related lint fixes.	2014-02-11 23:02:31 +00:00
Pedro Algarvio	0d1cf6edde	White-space related lint fixes.	2014-02-11 23:00:54 +00:00
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