Open Stack

Hi,
My review got approved and it was ready to merge but automatic merge failed.
I tried to rebase manually but it still fails.

I'm not very familiar with git, can someone give a hand?

 git rebase -i master
error: could not apply db4a3bb... New Cinder volume driver for openvstorage.

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase
--abort".
Could not apply db4a3bb3645b27de7b12c0aa405bde3530dd19f8... New Cinder
volume driver for openvstorage.
 git rebase --continue
etc/cinder/cinder.conf.sample: needs merge
You must edit all merge conflicts and then
mark them as resolved using git add

Review is: https://review.openstack.org/#/c/130733/

Thanks,
Eduard

-- 

*Eduard Biceri Matei, Senior Software Developer*
www.cloudfounders.com
 | eduard.matei at cloudfounders.com



*CloudFounders, The Private Cloud Software Company*

Disclaimer:
This email and any files transmitted with it are confidential and
intended solely for the use of the individual or entity to whom they
are addressed.
If you are not the named addressee or an employee or agent responsible
for delivering this message to the named addressee, you are hereby
notified that you are not authorized to read, print, retain, copy or
disseminate this message or any part of it. If you have received this
email in error we request you to notify us by reply e-mail and to
delete all electronic files of the message. If you are not the
intended recipient you are notified that disclosing, copying,
distributing or taking any action in reliance on the contents of this
information is strictly prohibited.
E-mail transmission cannot be guaranteed to be secure or error free as
information could be intercepted, corrupted, lost, destroyed, arrive
late or incomplete, or contain viruses. The sender therefore does not
accept liability for any errors or omissions in the content of this
message, and shall have no liability for any loss or damage suffered
by the user, which arise as a result of e-mail transmission.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openstack.org/pipermail/openstack-dev/attachments/20141208/e7a983d6/attachment.html>