Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vpnaas: Delete service #769

Merged
merged 5 commits into from
Feb 21, 2018
Merged

Conversation

simonre
Copy link
Contributor

@simonre simonre commented Feb 16, 2018

@coveralls
Copy link

Coverage Status

Coverage increased (+0.03%) to 73.393% when pulling 7d2ef14 on simonre:vpnaas-service-delete into cf2bbaa on gophercloud:master.

@coveralls
Copy link

coveralls commented Feb 16, 2018

Coverage Status

Coverage increased (+0.03%) to 73.421% when pulling 56ef594 on simonre:vpnaas-service-delete into 1858d1f on gophercloud:master.

@theopenlab-ci
Copy link

theopenlab-ci bot commented Feb 16, 2018

Build succeeded.

@jtopjian
Copy link
Contributor

@simonre This will need to be rebased with master when you have a moment. I did a quick glance and it looks fine, but I'll review it again once it's ready to go.

Thanks again for working on this series.

@theopenlab-ci
Copy link

theopenlab-ci bot commented Feb 19, 2018

Build succeeded.

@simonre
Copy link
Contributor Author

simonre commented Feb 19, 2018

@jtopjian I think this is ready. I'm not too familiar with rebasing so please tell me if I did something wrong.

@simonre simonre changed the title [WIP] [Pending #760] Vpnaas: Delete service Vpnaas: Delete service Feb 19, 2018
@theopenlab-ci
Copy link

theopenlab-ci bot commented Feb 19, 2018

Build succeeded.

@jtopjian
Copy link
Contributor

jtopjian commented Feb 20, 2018

@simonre

I'm not too familiar with rebasing so please tell me if I did something wrong.

Ah, no problem.

The first thing to try would be this:

$ git checkout master
$ git pull
$ git checkout vpnaas-service-delete
$ git rebase -i master

You'll then be prompted with a list of commits. You want to make sure that only the commits for this PR are chosen and remove any other commits from other PRs / merges.

If you want to practice, doing this should work:

$ git checkout master
$ git pull
$ git checkout vpnaas-service-delete
$ git checkout -b vpnaas-service-delete-rebase-practice
$ git rebase -i master

If you feel you made a mistake, you can then delete the vpnaas-service-delete-rebase-practice branch and try again.

Once you've got the vpnaas-service-delete branch rebased, you'll have to do a force push:

$ git push -f  simonre vpnaas-service-delete

During the code review, we don't want branches which were forced - only if a rebase is requested (like this).

Let me know if you need help and I'll rebase this on my side and provide the steps to walk you through it.

@theopenlab-ci
Copy link

theopenlab-ci bot commented Feb 20, 2018

Build succeeded.

@simonre
Copy link
Contributor Author

simonre commented Feb 20, 2018

@jtopjian This should do it. Thanks for the in-depth answers and explanations. Really appreciate it!

@jtopjian
Copy link
Contributor

@simonre Yes, perfect - nice work 😄

@jtopjian jtopjian merged commit d693a2e into gophercloud:master Feb 21, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants