53925 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicolas Delaby	b681f71eb3	compare images by ID not by name ... Because the name can be no longer be correct if an active tag moved to a different image. It happens frequently when working against `latest` tag.	2015-05-22 14:31:19 +02:00
Jayesh Kariya	b9745d5c4f	removed tuple index error	2015-05-22 16:56:33 +05:30
Diego Blanco	d2aec156ff	Fix for https://github.com/saltstack/salt/issues/23221	2015-05-22 11:21:04 +02:00
Justin Findlay	02ac4aa288	Merge pull request #24057 from rallytime/bp-22572 ... Backport #22572 to 2015.5	2015-05-21 23:36:25 -06:00
Justin Findlay	475032c9de	Merge pull request #24054 from mgwilliams/s3 ... s3.head: return useful data	2015-05-21 23:35:00 -06:00
Jayesh Kariya	f31dc921f5	resolved errors	2015-05-22 10:48:28 +05:30
Ronald van Zantvoort	49aad84b17	Small docfix for GitPillar	2015-05-21 20:36:39 -06:00
Matthew Williams	80c7a697ae	s3.head: return useful data	2015-05-22 00:14:36 +00:00
Matthew Williams	8677ad314b	Merge remote-tracking branch 'origin/develop' into boto	2015-05-22 00:12:57 +00:00
Matthew Williams	8996b19c33	modules.boto_route53: add zone management funcs	2015-05-22 00:12:50 +00:00
Justin Findlay	f851ec75ca	Merge pull request #24051 from rallytime/update_pycrypto_requirement ... Update minimum version for pycrypto	2015-05-21 17:44:17 -06:00
Justin Findlay	82de059891	Merge pull request #24040 from rallytime/bp-24027 ... Backport #24027 to 2015.5	2015-05-21 17:43:54 -06:00
Justin Findlay	d909781d97	Merge pull request #24039 from rallytime/bp-24015 ... Backport #24015 to 2015.5	2015-05-21 17:43:25 -06:00
Justin Findlay	4a0f254d22	Merge pull request #24038 from rallytime/bp-19599 ... Backport #19599 to 2015.5	2015-05-21 17:43:10 -06:00
rallytime	fba0de8bfa	Update minimum version for pycrypto	2015-05-21 16:49:34 -06:00
Nicole Thomas	42b87f1049	Merge pull request #24046 from rallytime/remove_key_test ... Remove key management test from digital ocean cloud tests	2015-05-21 16:32:04 -06:00
Nicole Thomas	eff54b1c5a	Merge pull request #24044 from cro/pgjsonb ... Remove spurious log message, fix typo in doc	2015-05-21 16:31:49 -06:00
Nicole Thomas	ac32000b5d	Merge pull request #24001 from msteed/issue-23883 ... issue #23883	2015-05-21 14:32:30 -06:00
rallytime	1d031caa78	Remove key management test from digital ocean cloud tests ... The create_key function was added to develop, but isn't present in 2015.5.	2015-05-21 13:37:34 -06:00
Nicole Thomas	d13e2a365c	Merge pull request #24041 from basepi/merge-forward-develop ... Merge forward from 2015.5 to develop	2015-05-21 13:32:37 -06:00
C. R. Oldham	de0663314a	Remove spurious log message, fix typo in doc	2015-05-21 13:26:30 -06:00
Colton Myers	58aed60838	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop ... Conflicts: salt/runners/lxc.py	2015-05-21 11:27:52 -06:00
Colton Myers	f7fae26059	Merge pull request #23995 from makinacorpus/lxc_path_pre ... Lxc path pre	2015-05-21 11:26:03 -06:00
Wout Maaskant	37d25d8bc6	Added baseurl as alias for url and mirrorlist in salt.modules.zypper.mod_repo.	2015-05-21 11:09:48 -06:00
YanChii	6bfaa94a8c	minor improovement of solarisips docs & fix typos	2015-05-21 11:06:51 -06:00
Justin Findlay	26d6851666	Merge pull request #24032 from kartiksubbarao/augeas_insert_16383 ... Update augeas_cfg.py	2015-05-21 11:03:42 -06:00
Daniel Fayette	ea00d3e786	Fix ssh_auth test mode, compare lines not just key ... Intened to fix #19598	2015-05-21 10:55:14 -06:00
Justin Findlay	55c9245075	Merge pull request #24025 from jayeshka/timezone-unit-test ... adding timezone unit test case	2015-05-21 10:50:53 -06:00
Justin Findlay	e243617659	Merge pull request #24023 from jayeshka/mongodb_database-states-unit-test ... adding states/mongodb_database unit test case	2015-05-21 10:49:17 -06:00
Justin Findlay	b377bd93e6	Merge pull request #24022 from jayeshka/modjk_worker-states-unit-test ... adding states/modjk_worker unit test case	2015-05-21 10:48:29 -06:00
Justin Findlay	dbbd05ba76	Merge pull request #24015 from YanChii/solarisips-docs2 ... minor improvement of solarisips docs & fix typos	2015-05-21 10:43:43 -06:00
Justin Findlay	b74c70b77c	Merge pull request #24013 from jbq/issue_24012 ... Fix enabling a service on Ubuntu #24012	2015-05-21 10:40:49 -06:00
Nicole Thomas	c938d00e9c	Merge pull request #24027 from wfhg/develop ... Add baseurl to salt.modules.zypper.mod_repo	2015-05-21 09:20:57 -06:00
Erik Johnson	2b74e81178	Merge pull request #24011 from ticosax/dockerng-ports-not-expose ... [dockerng] Tests for #23975 and apply same logic for `ports` and `port_bindings`	2015-05-21 10:00:22 -05:00
Jayesh Kariya	1ec33e22a7	removed assertion error	2015-05-21 18:57:58 +05:30
Mathieu Le Marec - Pasquet	412b39b802	Fix providers handling ... This fixes #24017 Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>	2015-05-21 15:00:23 +02:00
nleib	9686391d81	Update puppet.py	2015-05-21 15:55:52 +03:00
nleib	33f3d68489	send a disable message to disable puppet	2015-05-21 15:52:41 +03:00
Wout Maaskant	9d22aff3c7	Added baseurl as alias for url and mirrorlist in salt.modules.zypper.mod_repo.	2015-05-21 14:11:25 +02:00
Jayesh Kariya	d038b1fdbb	adding states/mongodb_user unit test case	2015-05-21 17:11:46 +05:30
Jayesh Kariya	5a9ac7effb	adding states/mongodb_database unit test case	2015-05-21 17:09:20 +05:30
Jayesh Kariya	05c0a985db	adding states/modjk_worker unit test case	2015-05-21 17:07:01 +05:30
Jayesh Kariya	16ecb28950	adding timezone unit test case	2015-05-21 17:05:56 +05:30
Dmitry Kuzmenko	702ad84a82	Add 'zmq_monitor' default config value	2015-05-21 12:23:55 +03:00
YanChii	f14381daed	minor improovement of solarisips docs & fix typos	2015-05-21 11:21:44 +02:00
Jean-Baptiste Quenot	868db3a50a	Fix enabling a service on Ubuntu #24012 ... This reverts commit bd6f5ea370.	2015-05-21 10:56:30 +02:00
Nicolas Delaby	5f8f24b655	Related to #23975 and apply same logic for ports and port_bindings	2015-05-21 09:49:21 +02:00
Justin Findlay	229594d33f	Merge pull request #23999 from neogenix/develop-23950 ... Develop branch fix for #23950	2015-05-20 22:19:50 -06:00
Justin Findlay	5bffd3045e	Merge pull request #24008 from davidjb/2014.7 ... Correct reST formatting for states.cmd documentation	2015-05-20 22:19:01 -06:00
David\ Beitey	8b8d0293d4	Correct reST formatting for documentation	2015-05-21 14:07:04 +10:00