60298 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mike Place	3b246db0b0	Fix stupid test	2016-02-02 12:39:24 -07:00
Adam Tengler	12dc677628	Changed list conversion to use correct method and return whole set	2016-01-28 11:20:19 +01:00
Adam Tengler	97eb4b8bf7	Pop values from new_tags set before loading into dict value ... This was causing state to fail with - Passed invalid arguments: can't serialize set([' tag']). Everytime when tags were defined.	2016-01-27 19:00:49 +01:00
Nicole Thomas	f6feddecb4	Merge pull request #30663 from isbm/isbm-zypper-latest-versionfail ... Zypper: latest version bugfix and epoch support feature	2016-01-27 10:10:41 -07:00
Nicole Thomas	9d8ddeb525	Merge pull request #30652 from mew1033/fix-sh-beacon ... Fix sh beacon	2016-01-27 10:00:29 -07:00
Bo Maryniuk	4336487765	Add support for epoch in Zypper	2016-01-27 12:37:26 +01:00
Bo Maryniuk	12d515fa0c	Fix package status filtering on latest version	2016-01-27 12:37:06 +01:00
Nicole Thomas	1fa1963895	Merge pull request #30657 from jfindlay/backport_quiet ... [2015.8] Backport #30378 and #29650	2016-01-26 17:34:00 -07:00
Nicole Thomas	3621651bf8	Merge pull request #30656 from rallytime/merge-forward-2015.8 ... [2015.8] Merge 2015.5 into 2015.8	2016-01-26 17:33:30 -07:00
rallytime	76ab6981a5	Merge branch '2015.5' into 2015.8	2016-01-26 16:21:29 -07:00
Derek Schaller	ca4adbf382	Adding ability to disable npm install silent flag	2016-01-26 16:19:03 -07:00
Derek Schaller	afe149eb6d	Adding ability to disable npm install silent flag	2016-01-26 16:19:03 -07:00
Derek Schaller	c1101b5f0b	Adding ability to disable npm install silent flag	2016-01-26 16:19:03 -07:00
Derek Schaller	d29ad8bbf6	Adding ability to disable npm install silent flag	2016-01-26 16:19:02 -07:00
Derek Schaller	7a21dbf0d9	Adding silent flag to npm.bootstrap	2016-01-26 16:09:42 -07:00
Derek Schaller	354c0bdf26	Adding silent flag to npm.bootstrap	2016-01-26 16:09:42 -07:00
Chandler Newby	256d037e0f	Fix sh beacon	2016-01-26 15:20:33 -07:00
Nicole Thomas	30e03a8b0c	Merge pull request #30644 from tbaker57/another_go_at_30573 ... Another go at fixing 30573	2016-01-26 13:18:41 -07:00
root	267b8827fd	Another go at fixing 30573	2016-01-26 13:40:15 -05:00
Colton Myers	7d307e2a04	Merge pull request #30611 from isbm/isbm-zypper-latest ... Bugfix: Zypper `pkg.latest` crash fix	2016-01-26 09:35:47 -07:00
Colton Myers	5bc11d7539	Merge pull request #30631 from rallytime/fix-7811 ... Refactor rabbitmq_cluster states to use test=true functionality correctly	2016-01-26 09:23:49 -07:00
Bo Maryniuk	a7141be651	Put 'kwargs' on its own line according to the common pattern	2016-01-26 10:03:02 +01:00
Colton Myers	ef6c4e8377	Merge pull request #30628 from rallytime/fix-25658 ... Refactor rabbitmq_policy states to use test=true functionality correctly	2016-01-25 17:21:03 -07:00
Colton Myers	80d0e428aa	Merge pull request #30624 from cro/remove_bad_symlinks ... Remove bad symlinks from osx pkg dir	2016-01-25 17:02:25 -07:00
Colton Myers	330ea9a292	Merge pull request #30622 from rallytime/fix-30621 ... Add glance state to list of state modules	2016-01-25 16:55:54 -07:00
Colton Myers	f00d8f398a	Merge pull request #30618 from rallytime/bp-30591 ... Back-port #30591 to 2015.8	2016-01-25 16:55:20 -07:00
rallytime	bf9ffded6d	Refactor rabbitmq_cluster states to use test=true functionality correctly ... Fixes #7811	2016-01-25 16:47:54 -07:00
Colton Myers	643c9c9616	Merge pull request #30586 from abednarik/fix_comment_line_perms ... Fix comment_line permissions.	2016-01-25 16:24:01 -07:00
Nicole Thomas	6b940d9655	Merge pull request #30625 from jfindlay/eauth_acl ... doc.topics.eauth: clarify client_acl vs eauth	2016-01-25 16:03:24 -07:00
rallytime	1e8e86007c	Refactor rabbitmq_policy states to use test=true functionality correctly ... Fixes #25658	2016-01-25 15:21:19 -07:00
Justin Findlay	b5e2cff028	doc.topics.eauth: clarify client_acl vs eauth ... Fixes #30587.	2016-01-25 14:32:34 -07:00
C. R. Oldham	f5fd38624e	Remove bad symlinks in osx pkg dirs	2016-01-25 14:29:51 -07:00
rallytime	57b7e6cc93	Add glance state to list of state modules ... Fixes #30621	2016-01-25 12:35:19 -07:00
Michael Alphonso	2c9d59fa42	looks like a re-merge of PR #20972 which relates to #19288	2016-01-25 11:22:11 -07:00
Justin Findlay	1c6c394d0e	Merge pull request #30615 from jfindlay/2015.8 ... add 2015.8.4 release notes	2016-01-25 11:11:02 -07:00
Justin Findlay	e4043403e4	add 2015.8.4 release notes	2016-01-25 11:10:07 -07:00
Bo Maryniuk	ee9b3f859b	Bugfix: do not treat SLS id as a package name if an empty 'pkgs' list specified.	2016-01-25 19:01:42 +01:00
Nicole Thomas	ec50581aad	Merge pull request #30612 from rallytime/bp-29940 ... Back-port #29940 to 2015.8	2016-01-25 10:52:43 -07:00
Colton Myers	48373e0ea9	Merge pull request #30613 from basepi/minion_clearfuncs_2015.8 ... Fix minion/syndic clearfuncs	2016-01-25 10:40:59 -07:00
Nicole Thomas	89b4f3de1b	Merge pull request #30609 from seanjnkns/backport_30602 ... Fix documentation for pillar_merge_lists which default is False, not …	2016-01-25 10:15:45 -07:00
Christophe Drevet-Droguet	3ebb8249d7	file.line: better diff	2016-01-25 10:12:32 -07:00
Nicole Thomas	24ead62c41	Merge pull request #30584 from julianbrost/fix-doc-file-line-missing-colon ... file.line state: add missing colon in docstring	2016-01-25 09:37:38 -07:00
Nicole Thomas	a7ba2df5e2	Merge pull request #30589 from terminalmage/2015.5-2015.8 ... Merge 2015.5 into 2015.8	2016-01-25 09:20:41 -07:00
Sean Jenkins	9924acdc43	Fix documentation for pillar_merge_lists which default is False, not True. From PR #30062	2016-01-25 08:57:39 -07:00
Bo Maryniuk	d3cfd8ed41	Cleanup formatting	2016-01-25 16:43:50 +01:00
Bo Maryniuk	1bdbaac658	Add error handling	2016-01-25 16:43:25 +01:00
Bo Maryniuk	2ec5cec8a4	Add a new line before the last return	2016-01-25 16:42:20 +01:00
Bo Maryniuk	424383b8c4	Remove unnecessary complexity and string increment	2016-01-25 16:41:52 +01:00
Bo Maryniuk	48e8d90343	Avoid backslashes where they are not needed	2016-01-25 16:41:11 +01:00
Bo Maryniuk	6df5d500f0	Use regexp type for the string.	2016-01-25 16:40:50 +01:00