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

Wait #46

Merged
merged 5 commits into from
Jun 25, 2013
Merged

Wait #46

merged 5 commits into from
Jun 25, 2013

Conversation

pearkes
Copy link
Collaborator

@pearkes pearkes commented Jun 25, 2013

Gifs are better than words, sometimes:

tugboat_wait

Basically just waits until a droplet comes to a state, like active.

blom added 2 commits June 24, 2013 22:56
Add a password-reset alias and rename the passwordreset method to the
more idiomatic password_reset.
@blom
Copy link
Collaborator

blom commented Jun 25, 2013

Looks good! But you seem to have based your branch on password_reset instead of master, and included a commit that should not be there?

@pearkes
Copy link
Collaborator Author

pearkes commented Jun 25, 2013

Hm, yes, I wasn't paying attention I guess. :)

Just rebased against it so should merge fine.

pearkes added a commit that referenced this pull request Jun 25, 2013
@pearkes pearkes merged commit 3a4b73e into master Jun 25, 2013
@pearkes pearkes deleted the wait branch June 25, 2013 14:58
@pearkes pearkes mentioned this pull request Jun 25, 2013
@blom
Copy link
Collaborator

blom commented Jun 25, 2013

👍

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.

2 participants