git checkout master
git pull https://gitee.com/src-openeuler/openstack-cinder.git revert-merge-18-master
git push origin master