48735 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Colton Myers	34ff989d66	Convert keyword args to key=value strings in salt-ssh	2015-06-10 18:58:08 -06:00
Nicole Thomas	bb2fd6a970	Merge pull request #24574 from jacobhammons/19901 ... Refs #19901	2015-06-10 14:09:23 -06:00
rallytime	c82f135d2e	Disabled some flaky tests until we can figure out how to make them more reliable	2015-06-10 14:04:14 -06:00
Colton Myers	b03166cde3	Merge pull request #24577 from basepi/merge-forward-2015.5 ... [2015.5] Merge forward from 2014.7 to 2015.5	2015-06-10 13:46:22 -06:00
Colton Myers	e1d45ccf3b	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5	2015-06-10 12:02:42 -06:00
Jacob Hammons	e2a2946dc7	Refs #19901	2015-06-10 11:31:37 -06:00
Nicole Thomas	3ec457beef	Merge pull request #24571 from jacobhammons/24235 ... Refs #24235	2015-06-10 11:02:18 -06:00
Nicole Thomas	fe07eb5653	Merge pull request #24565 from pille/munin-ignore-broken-symlinks ... fix backtrace, when listing plugins	2015-06-10 10:33:11 -06:00
Jacob Hammons	8df5d53bb8	Refs #24235	2015-06-10 09:45:03 -06:00
Jayesh Kariya	273b994e91	adding states/rdp unit test case.	2015-06-10 18:41:29 +05:30
pille	8511a6c0a6	fix backtrace, when listing plugins ... munin usually symlinks its plugins in /etc/munin/plugins. this catches the case that the symlink is broken.	2015-06-10 14:44:47 +02:00
Nicole Thomas	251c8f9f5f	Merge pull request #24554 from lyft/pecl-module-fix ... Fix yes usage for pecl defaults	2015-06-09 17:59:49 -06:00
Ryan Lane	56a9cfcf24	Fix yes usage for pecl defaults	2015-06-09 14:53:11 -07:00
Justin Findlay	d376390f76	Merge pull request #24530 from twangboy/fix_24427 ... Start Minion Service on Silent Install	2015-06-09 15:30:08 -06:00
Joe Julian	cfc3b43ba2	Don't pollute the TZ environment variable	2015-06-09 14:26:27 -07:00
Thomas S Hatch	dbd49b4acb	Merge pull request #24535 from rallytime/bp-24518 ... Back-port #24518 to 2015.5	2015-06-09 14:06:18 -06:00
Joe Julian	cba8d3f923	pep8	2015-06-09 12:50:36 -07:00
Joe Julian	9cb7015568	Mark keyword version adds	2015-06-09 12:50:24 -07:00
Joe Julian	76e2583265	Merge tls changes from develop	2015-06-09 12:48:36 -07:00
Colton Myers	485ed3cff9	Merge pull request #24538 from basepi/merge-forward-2015.5 ... [2015.5] Merge forward from 2014.7 to 2015.5	2015-06-09 11:27:20 -06:00
Colton Myers	6a8039d468	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 ... Conflicts: salt/states/rabbitmq_vhost.py	2015-06-09 11:26:09 -06:00
rallytime	fc75197616	Pylint fix	2015-06-09 10:51:32 -06:00
Andrei Nistor	3e08840988	Update modules path for operating systems using systemd	2015-06-09 10:51:31 -06:00
twangboy	673e1d809e	Added missing panel.bmp for installer	2015-06-09 10:28:09 -06:00
twangboy	cc50218b01	Start Minion Service on Silent Install	2015-06-09 09:34:41 -06:00
Justin Findlay	73e6388acd	Merge pull request #24495 from jayeshka/rabbitmq_vhost_states-unit-test ... adding states/rabbitmq_vhost unit test case.	2015-06-09 09:33:23 -06:00
Justin Findlay	bf1abccebe	Merge pull request #24445 from jayeshka/pyrax_queues_states-unit-test ... adding states/pyrax_queues unit test case.	2015-06-09 09:28:45 -06:00
Thomas S Hatch	0247e8d10d	Merge pull request #24490 from aneeshusa/fix-pacman-list-upgrades ... Fix pacman.list_upgrades for new python_shell default.	2015-06-09 09:13:16 -06:00
Thomas S Hatch	6268ddb43a	Merge pull request #24517 from steverweber/ipmi_doc ... small fixes to the ipmi docs	2015-06-09 09:10:14 -06:00
Jayesh Kariya	31889e38eb	cosmetic change.	2015-06-09 19:44:16 +05:30
Nicole Thomas	3728b3f327	Merge pull request #24524 from jayeshka/rabbitmq_vhost_states-module ... any() takes list oy tuple.	2015-06-09 07:49:42 -06:00
Jayesh Kariya	01c99ad767	any() takes list oy tuple.	2015-06-09 18:12:53 +05:30
Jayesh Kariya	cf501cf60d	resolved error.	2015-06-09 18:10:37 +05:30
Jayesh Kariya	4bb6087722	Merge branch '2015.5' of https://github.com/saltstack/salt into rabbitmq_vhost_states-unit-test	2015-06-09 18:09:05 +05:30
Nicole Thomas	dd23de885b	Merge pull request #24482 from eliasp/2015.5-states.dockerio-docker.running-doc ... 'docker.running' needs now the 'image' param.	2015-06-08 22:43:04 -06:00
Elias Probst	5de741d626	'docker.running' needs now the 'image' param.	2015-06-09 06:41:33 +02:00
Nicole Thomas	2a727c3f55	Merge pull request #24515 from basepi/susexml23503 ... [2015.5] Add xml library to the salt-thin	2015-06-08 22:10:06 -06:00
Nicole Thomas	6ebc476bb3	Merge pull request #24513 from jquast/2014.7-bugfix-iteritem ... bugfix use of 'iteritem' in 2014.7 branch	2015-06-08 22:06:36 -06:00
Nicole Thomas	fce998a58b	Merge pull request #24497 from jayeshka/rbenv_states-unit-test ... adding states/rbenv unit test case.	2015-06-08 21:56:09 -06:00
Nicole Thomas	2bcb4b1eed	Merge pull request #24496 from jayeshka/rabbitmq_user_states-unit-test ... adding states/rabbitmq_user unit test case.	2015-06-08 21:55:23 -06:00
Steve Weber	6413712844	lint ... lint	2015-06-08 23:32:05 -04:00
Nicole Thomas	02a597bf49	Merge pull request #24481 from eliasp/2015.5-salt.states.powerpath-license_typo ... Fix typo (licnese → license).	2015-06-08 21:30:25 -06:00
Steve Weber	e78aea9b01	more small fixes to the ipmi docs ... more small fixes to the ipmi docs	2015-06-08 23:01:41 -04:00
Thomas S Hatch	5ad3db5ffb	Merge pull request #24467 from thenewwazoo/fix-dockerio-bound-volumes ... Fix dockerio bound volumes	2015-06-08 19:40:23 -06:00
Colton Myers	078b33eaaf	Add xml library to the thin	2015-06-08 17:38:11 -06:00
C. R. Oldham	d236fbd38f	Merge pull request #24504 from rallytime/move_vsphere_deprecation_2015.5 ... Move vsphere deprecation to 2015.5	2015-06-08 16:43:05 -06:00
C. R. Oldham	cb5546085c	Merge pull request #24506 from rallytime/bp-24450 ... Backport #24450 to 2015.5	2015-06-08 16:42:14 -06:00
Brandon Matthews	db4e3dc69b	Let's raise an exception if create fails	2015-06-08 15:21:27 -07:00
Brandon Matthews	d1d85dd685	Add logging	2015-06-08 15:21:27 -07:00
Brandon Matthews	ddc63f0f30	Fix volume handling when creating containers ... Fixes #24455	2015-06-08 15:21:27 -07:00