46961 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mike Place	d16fd18a9c	Cleaning empty pass statements	2015-02-11 22:21:20 -07:00
Thomas S Hatch	dc07c023cf	Merge branch 'cxfcxf-develop' into develop	2015-02-11 18:13:58 -07:00
Thomas S Hatch	bb02e54ccc	lint	2015-02-11 18:13:35 -07:00
Thomas S Hatch	daca04fe85	Merge branch 'develop' of https://github.com/cxfcxf/salt into cxfcxf-develop	2015-02-11 18:10:44 -07:00
Thomas S Hatch	22efff8eb8	Merge pull request #20609 from l2ol33rt/logging_pcre_roster_flat ... Consistent logging for pcre match in flat roster	2015-02-11 18:04:41 -07:00
Thomas S Hatch	51a8fc1c6b	Merge pull request #20607 from cachedout/masterless_raet ... Support masterless mode for RAET	2015-02-11 18:04:08 -07:00
cxfcxf	fad3fb0859	fix Exception and giving status to range interface file	2015-02-11 16:14:58 -08:00
jfindlay	acb3401c8e	Merge pull request #20608 from cachedout/msgpack_empty ... Avoid trying to deserialize empty files	2015-02-11 17:04:10 -07:00
Mike Place	389e02b6d6	Avoid trying to deserialize empty files ... This fixes errors encountered by the minion where an attempt to read an empty file from the cache will produce msgpack exceptions in the log.	2015-02-11 16:35:14 -07:00
jfindlay	60202585b7	Merge pull request #20606 from rallytime/pylinting ... Python 3 compat for archive.py	2015-02-11 16:11:20 -07:00
Mike Place	78bb2ce506	Support masterless mode for RAET ... Also refactored caller to better support additional future transports.	2015-02-11 16:10:25 -07:00
Robert James Hernandez	7db9554094	Consistent logging for pcre match	2015-02-11 14:59:10 -08:00
Thomas S Hatch	b0ff607669	Merge pull request #20577 from cachedout/ioflo_dummy ... RAET performance testing	2015-02-11 15:51:19 -07:00
cxfcxf	26eda7cdaf	add range interface support for redhat system	2015-02-11 14:24:25 -08:00
rallytime	ec809331e7	Python 3 compat for archive.py	2015-02-11 15:15:59 -07:00
jfindlay	a1043ab87a	Merge pull request #20605 from jfindlay/tar ... fix tar check	2015-02-11 15:04:27 -07:00
Justin Findlay	8b68244eaa	chmod -x tests/runtests.py	2015-02-11 15:03:36 -07:00
Mike Place	517a85f6db	More lint	2015-02-11 13:31:37 -07:00
Mike Place	e316b183e6	Simplify to just loop. No need for calibration since it doesn't max out.	2015-02-11 13:30:09 -07:00
Mike Place	e8472ed9cc	Pylint	2015-02-11 13:30:09 -07:00
Mike Place	2befd356c8	Iterate over workers directly	2015-02-11 13:30:09 -07:00
Mike Place	716fa253cb	Remove servicequeue because ioflo does this ... Add templating method, just the basics	2015-02-11 13:30:09 -07:00
Mike Place	463f95ccc0	Rough, but it works	2015-02-11 13:30:09 -07:00
Mike Place	5a730b13b9	Better ioflo routing	2015-02-11 13:30:09 -07:00
Mike Place	81221eac53	ioflow routing to dummy behaviour	2015-02-11 13:30:09 -07:00
Mike Place	0c3d97c8ad	Merge pull request #20598 from thatch45/cachedout-unecessary_nest ... Merge #20572 with fixes	2015-02-11 13:12:32 -07:00
cxfcxf	2d28640c17	add ability to turn off arpcheck	2015-02-11 12:00:25 -08:00
Alexander Schwartz	7c6b8f1221	clean up lint messages	2015-02-11 19:57:14 +00:00
Alexander Schwartz	bc101bc582	simplified code after review	2015-02-11 19:56:43 +00:00
Colton Myers	fc5238400b	Merge pull request #20600 from rallytime/rc_candidate_docs ... Add release candidate notification to docs sidebar	2015-02-11 12:33:42 -07:00
rallytime	3c2dd7d801	Change the releasecnadidates doc to reflect 2015.2.0rc1	2015-02-11 12:30:16 -07:00
rallytime	a42a5fb6d5	Add release candidate notification to docs sidebar ... v2015.2.0rc1	2015-02-11 12:17:29 -07:00
jfindlay	a572be2ca3	Merge pull request #20594 from basepi/merge-forward-develop ... Merge forward from 2015.2 to develop	2015-02-11 11:40:15 -07:00
Thomas S Hatch	776e64c2aa	Lint	2015-02-11 11:24:08 -07:00
Thomas S Hatch	821d52a5f6	Merge branch 'unecessary_nest' of https://github.com/cachedout/salt into cachedout-unecessary_nest	2015-02-11 11:23:43 -07:00
Thomas S Hatch	b63cba0633	Merge pull request #20543 from dmyerscough/kerberos ... Initial Kerberos Management	2015-02-11 11:22:14 -07:00
Colton Myers	b8efc6e307	Merge pull request #4 from jfindlay/merge_dev ... fix iptables unit tests for merge forward	2015-02-11 11:01:21 -07:00
Justin Findlay	657b79912e	fix iptables unit tests for merge forward	2015-02-11 10:52:07 -07:00
Colton Myers	01a4dc600b	Fix lint for gitfs.py	2015-02-11 10:22:43 -07:00
Colton Myers	83587852c8	Reset to develop version of loader.py for develop ... Fixes errors from backport and then merge forward	2015-02-11 10:12:18 -07:00
Colton Myers	58c6f908b9	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop ... Conflicts: salt/modules/iptables.py	2015-02-11 09:23:06 -07:00
Colton Myers	1e5bd7e1b8	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop ... Conflicts: salt/client/mixins.py salt/fileserver/gitfs.py salt/loader.py salt/renderers/pyobjects.py salt/utils/args.py salt/utils/decorators/__init__.py salt/utils/lazy.py tests/integration/loader/globals.py tests/integration/loader/loader.py	2015-02-11 09:17:35 -07:00
David Boucha	ce01b26669	Merge pull request #20589 from Unity-Technologies/choco-local-installed ... Added the ability to filter chocolatey packages by local only	2015-02-11 08:51:41 -07:00
jfindlay	03b44c3650	Merge pull request #20585 from Unity-Technologies/pip-windows-bin ... Fixed returned path for pip binary on Windows	2015-02-11 08:41:37 -07:00
jfindlay	ec54d4a6f9	Merge pull request #20584 from dnshl/change-adjective-in-tutorial ... Change Adjective in Starting States Tutorial	2015-02-11 08:25:27 -07:00
Daniel Hobley	16357669f8	Added the ability to filter chocolatey packages by local only	2015-02-11 15:55:04 +01:00
Daniel Hobley	49f50bb31f	Fixed returned path for pip binary on Windows ... - Makes sure we have the slashes correctly escaped	2015-02-11 11:16:05 +01:00
Dennis Hall	5cf8e389d4	Change Adjective in Starting States Tutorial ... The line which compares the previous two examples to the following YAML example should use a demonstrative adjective like 'these'.	2015-02-11 10:44:46 +01:00
Thomas S Hatch	0b95122e9a	Merge pull request #20583 from jfindlay/fix_iptables ... add '--wait' to iptables commands	2015-02-10 22:24:15 -07:00
Justin Findlay	4873ce9406	add --wait option to iptables mod ... fixes #19530	2015-02-10 21:22:04 -07:00