Merge "Windows iSCSI: Add CHAP authentication support"

author Jenkins <jenkins@review.openstack.org>

Wed, 29 Jul 2015 05:36:04 +0000 (05:36 +0000)

committer Gerrit Code Review <review@openstack.org>

Wed, 29 Jul 2015 05:36:04 +0000 (05:36 +0000)
author Jenkins <jenkins@review.openstack.org>
Wed, 29 Jul 2015 05:36:04 +0000 (05:36 +0000)
committer Gerrit Code Review <review@openstack.org>
Wed, 29 Jul 2015 05:36:04 +0000 (05:36 +0000)
diff --cc cinder/tests/unit/windows/test_windows.py
Simple merge
diff --cc cinder/volume/drivers/windows/windows_utils.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Wed, 29 Jul 2015 05:36:04 +0000 (05:36 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Wed, 29 Jul 2015 05:36:04 +0000 (05:36 +0000)
		1	2
cinder/tests/unit/windows/test_windows.py	patch \|	diff1 \|	diff2 \|	blob \| history
cinder/volume/drivers/windows/windows_utils.py	patch \|	diff1 \|	diff2 \|	blob \| history