Merge "Replace Simple/Chance Scheduler with FilterScheduler"

author Jenkins <jenkins@review.openstack.org>

Mon, 6 Jan 2014 02:06:17 +0000 (02:06 +0000)

committer Gerrit Code Review <review@openstack.org>

Mon, 6 Jan 2014 02:06:17 +0000 (02:06 +0000)
author Jenkins <jenkins@review.openstack.org>
Mon, 6 Jan 2014 02:06:17 +0000 (02:06 +0000)
committer Gerrit Code Review <review@openstack.org>
Mon, 6 Jan 2014 02:06:17 +0000 (02:06 +0000)
diff --cc cinder/scheduler/manager.py
Simple merge
diff --cc cinder/tests/conf_fixture.py
Simple merge
diff --cc cinder/tests/scheduler/test_scheduler.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Mon, 6 Jan 2014 02:06:17 +0000 (02:06 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Mon, 6 Jan 2014 02:06:17 +0000 (02:06 +0000)
		1	2
cinder/scheduler/manager.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/tests/conf_fixture.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/tests/scheduler/test_scheduler.py	patch \|	diff1 \|	diff2 \|	blob \| history