add attach and detach disk #2529

Closed
wants to merge 3 commits into
from

Conversation

Projects
None yet
4 participants
Contributor

neillturner commented Dec 31, 2013

No description provided.

Owner

geemus commented Dec 31, 2013

@neillturner - looks like this isn't quite a clean merge, could you rebase? Thanks!

@icco - could you review?

Contributor

neillturner commented Dec 31, 2013

i will have to read up on rebase -)

On 31 December 2013 14:29, Wesley Beary notifications@github.com wrote:

@neillturner https://github.com/neillturner - looks like this isn't
quite a clean merge, could you rebase? Thanks!

@icco https://github.com/icco - could you review?


Reply to this email directly or view it on GitHubhttps://github.com/fog/fog/pull/2529#issuecomment-31396399
.

Owner

geemus commented Dec 31, 2013

@neillturner ha! fair enough. Here is a pretty good overview: https://www.atlassian.com/git/tutorial/rewriting-git-history#!rebase

In practice, you probably just need to do this:

git pull --rebase

In effect it will rewind your master to where it matches with fog/fog. Then it will add all the commits since you updated previously. Finally it should then add your new commits on top. Unless there is a conflict within the particular files, you should then be done. If there is a conflict you have to go in and manually merge, but that happens less frequently. Hopefully that helps!

Contributor

neillturner commented Dec 31, 2013

Wesley,
Google Compute Engine is going to be big so important to get the support
in fog. Also their api very clean and elegant.
Neill

On 31 December 2013 14:47, Wesley Beary notifications@github.com wrote:

@neillturner https://github.com/neillturner ha! fair enough. Here is a
pretty good overview:
https://www.atlassian.com/git/tutorial/rewriting-git-history#!rebase

In practice, you probably just need to do this:

git pull --rebase

In effect it will rewind your master to where it matches with fog/fog.
Then it will add all the commits since you updated previously. Finally it
should then add your new commits on top. Unless there is a conflict within
the particular files, you should then be done. If there is a conflict you
have to go in and manually merge, but that happens less frequently.
Hopefully that helps!


Reply to this email directly or view it on GitHubhttps://github.com/fog/fog/pull/2529#issuecomment-31397003
.

Owner

geemus commented Dec 31, 2013

For sure. I'll be happy to get it in, but I usually defer to @icco (who is more of an expert in the specifics) to make sure nothing gets missed. Hopefully he can review it soon so that we can get this merged. Thanks!

Contributor

neillturner commented Dec 31, 2013

no problem. good for you to delegate as much as possible -)

On 31 December 2013 15:45, Wesley Beary notifications@github.com wrote:

For sure. I'll be happy to get it in, but I usually defer to @iccohttps://github.com/icco(who is more of an expert in the specifics) to make sure nothing gets
missed. Hopefully he can review it soon so that we can get this merged.
Thanks!


Reply to this email directly or view it on GitHubhttps://github.com/fog/fog/pull/2529#issuecomment-31399116
.

Member

icco commented Jan 1, 2014

Hey @neillturner, it does look like this merge is pretty funky. Make sure you've pulled in the latest changes from the fog repo, since I cleaned up your whitespace after your last pull request.

Also, if possible, on your machine named pibuk-lp71.pibenchmark.com, you might want to set your email and name so they are attached to your commits going forward. https://help.github.com/articles/setting-your-email-in-git has a guide on how.

Contributor

allomov commented Jan 10, 2014

I guess this PR has much common with #2501.

Member

icco commented Apr 10, 2014

Closing this as the functionality was fixed elsewhere.

icco closed this Apr 10, 2014

Owner

geemus commented Apr 10, 2014

Thanks!

On Thu, Apr 10, 2014 at 5:18 AM, Nat Welch notifications@github.com wrote:

Closed #2529 #2529.

Reply to this email directly or view it on GitHubhttps://github.com/fog/fog/pull/2529
.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment