47021 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Justin Findlay	5405e35b14	add _has_option() to iptables mod	2015-02-10 21:04:59 -07:00
jfindlay	a4572f34f3	Merge pull request #20578 from rallytime/bp-20561 ... Backport #20561 to 2014.7	2015-02-10 20:51:23 -07:00
Thomas S Hatch	e677b20db2	Merge pull request #20576 from jfindlay/bp-20354 ... backport #20354 to 2015.2	2015-02-10 19:56:34 -07:00
Thomas S Hatch	45301d3492	Merge pull request #20579 from rallytime/bp-20567 ... Backport #20567 to 2014.7	2015-02-10 19:56:22 -07:00
Thomas S Hatch	293613830f	Merge pull request #20580 from kaithar/issue/layman-improvements ... Layman improvements	2015-02-10 19:55:57 -07:00
Mike Place	14e2f9f1ca	Merge pull request #20582 from cachedout/btrfs_lint ... Lint btrfs test	2015-02-10 18:39:15 -07:00
Mike Place	5db9172884	Lint btrfs test	2015-02-10 19:09:30 -07:00
Kaithar	fa59dd33bb	PEP fix	2015-02-11 01:18:54 +00:00
Thomas S Hatch	757010e6cd	Merge pull request #20530 from kim0/zfs-chk-kernel-module-2015.2 ... ZFS chk kernel module (fixes #12845)	2015-02-10 17:29:42 -07:00
Thomas S Hatch	e718cadc74	Merge pull request #20573 from cachedout/core_pass ... Remove dead code	2015-02-10 17:28:20 -07:00
Thomas S Hatch	e79b1be568	Merge pull request #20574 from basepi/merge-forward-2015.2 ... Merge forward from 2014.7 to 2015.2	2015-02-10 17:27:58 -07:00
Kaithar	aee0a7b32f	Capture results and raise an exception appropriately.	2015-02-11 00:15:19 +00:00
Thomas S Hatch	a49420da95	Merge pull request #20566 from bdrung/log-file-group-v2 ... Make log file group readable	2015-02-10 17:13:57 -07:00
Mike Place	c41998cc4f	Remove another test.	2015-02-10 17:12:31 -07:00
Mike Place	836b525779	Disable gitfs test that does not produce valuable data	2015-02-10 17:11:04 -07:00
Kaithar	485082d99d	Check if the overlay actually exists before trying to add it. ... This has the secondary effect of triggering a remote fetch if needed, thus initialising the layman database for us.	2015-02-10 23:59:58 +00:00
Kaithar	d722a56977	Add an execution function to get a list of all overlays.	2015-02-10 23:50:45 +00:00
Justin Findlay	fa447c9640	normalizing iptables.check for easier testing	2015-02-10 16:50:23 -07:00
Mike Place	7c80971c34	Remove dead code	2015-02-10 16:09:27 -07:00
Mike Place	9f23ac8625	Indentation	2015-02-10 15:58:47 -07:00
Mike Place	5eab79995a	Remove unnecessary parens	2015-02-10 15:57:07 -07:00
Mike Place	c4c9fd48fc	Cleanup unecessary parens	2015-02-10 15:55:46 -07:00
Mike Place	f95da00616	Fix unecessary nest in incron state	2015-02-10 15:51:24 -07:00
Mike Place	3fb4f54662	Fix unecessary nest in drac module	2015-02-10 15:50:08 -07:00
Colton Myers	fc63ddb77f	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: salt/modules/linux_lvm.py tests/unit/utils/validate_net_test.py	2015-02-10 15:45:12 -07:00
Mike Place	679d704029	Merge pull request #20514 from jayeshka/btrfs-unit-test ... adding btrfs unit test case	2015-02-10 14:32:44 -07:00
Mike Place	55e4227b93	Merge pull request #20571 from cachedout/lint_gitfs ... gitfs test lint fix	2015-02-10 14:25:59 -07:00
Mike Place	c5081179ef	gitfs test lint fix	2015-02-10 14:57:28 -07:00
Mike Place	d579bc2241	Merge pull request #20569 from cachedout/lint_tls ... Lint tls module	2015-02-10 13:53:46 -07:00
Mike Place	85c9df9596	Lint tls module	2015-02-10 14:23:06 -07:00
Mike Place	d49533b053	Merge pull request #20568 from cachedout/more_git_test ... Last time with find removed	2015-02-10 13:09:09 -07:00
Mike Place	78309a0e2d	Last time with find removed	2015-02-10 13:40:33 -07:00
Thomas S Hatch	746da4857e	Merge pull request #20525 from DSRCompany/stats_runner ... Stats runner	2015-02-10 12:49:00 -07:00
Nicole Thomas	073d7175c5	Merge pull request #20509 from bechtoldt/2014.7-arbe ... fix broken ipv6 address verification in salt.utils.validate.net, fixes #20508	2015-02-10 12:44:20 -07:00
Mike Place	dbd74fbeee	Remove another test.	2015-02-10 11:54:16 -07:00
Mike Place	b083a9497b	Merge pull request #20567 from cachedout/more_git_test ... Remove another test.	2015-02-10 11:22:40 -07:00
Nicole Thomas	d196ad2f6c	Merge pull request #20563 from thatch45/RobertFach-feature-20340-gem-sources ... Merge #20382	2015-02-10 10:57:59 -07:00
Dmitry Kuzmenko	5291fa695f	Fixed lint errors	2015-02-10 20:20:07 +03:00
Dmitry Kuzmenko	de3b50a8c8	Added road_stats and lane_stats runners	2015-02-10 20:20:07 +03:00
Dmitry Kuzmenko	b7187c2685	Manage get_stats runner implementation.	2015-02-10 20:20:07 +03:00
Thomas S Hatch	8734d6f8cc	Merge pull request #20554 from Unity-Technologies/unzip-symlink ... Fixed the extraction of symbolic links from zip archives	2015-02-10 10:18:14 -07:00
Thomas S Hatch	ad370bc856	Merge pull request #20500 from eliasp/2014.7-issue-20499-fileserver-encoding ... Use same string encoding for results from all fileserver backends.	2015-02-10 10:00:04 -07:00
Thomas S Hatch	bd4bbd1eb4	Merge pull request #20495 from jcockhren/gpg-renderer-doc-update ... Fixed language describing the two ways to enable the gpg renderer	2015-02-10 09:57:13 -07:00
Thomas S Hatch	c8a1e6c322	Merge pull request #20476 from atbell/get_signed_cert_in_tls_module ... get certs in tls module	2015-02-10 09:56:34 -07:00