Merge "Validate bool value using strutils.bool_from_string method"

author Jenkins <jenkins@review.openstack.org>

Mon, 6 Jul 2015 18:47:45 +0000 (18:47 +0000)

committer Gerrit Code Review <review@openstack.org>

Mon, 6 Jul 2015 18:47:45 +0000 (18:47 +0000)
author Jenkins <jenkins@review.openstack.org>
Mon, 6 Jul 2015 18:47:45 +0000 (18:47 +0000)
committer Gerrit Code Review <review@openstack.org>
Mon, 6 Jul 2015 18:47:45 +0000 (18:47 +0000)
diff --cc cinder/api/contrib/admin_actions.py
Simple merge
diff --cc cinder/api/v2/snapshots.py
Simple merge
diff --cc cinder/tests/unit/api/contrib/test_admin_actions.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Mon, 6 Jul 2015 18:47:45 +0000 (18:47 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Mon, 6 Jul 2015 18:47:45 +0000 (18:47 +0000)
		1	2
cinder/api/contrib/admin_actions.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/api/v2/snapshots.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/tests/unit/api/contrib/test_admin_actions.py	patch \|	diff1 \|	diff2 \|	blob \| history