Alagu posterous importer (conflicts resolved, includes rate limiting) #477

Closed
wants to merge 4 commits into
from

Conversation

Projects
None yet
5 participants
@simensen
Contributor

simensen commented Jan 23, 2012

I merged #402 onto master at a point after #472 and resolved the conflicts. The merge is at 5d6e87b. In testing the importer I ran into some rate limiting issues from Posterous and updated the code to handle those. (sleep for retry_after + 1 seconds)

When I tried to rebase master onto #402 git informed me that the branches had diverged. I would have needed to --force the pushto GitHub and I'm not sure what would have happend to the PR at that point. I am not skilled enough at git to know how I could have done this any differently so I created a new branch and PR instead.

If it would be better to --force the existing PR please let me know the best way for me to do that. :) Otherwise I am hoping this PR merges cleanly.

alagu and others added some commits Sep 16, 2011

YAML front matter fix, cleaned up slug generation, added tags and sto…
…re some posterous information from the original post.
Merge remote-tracking branch 'origin/alagu-master' into alagu-postero…
…us-importer-rebased

Conflict created due to #472.

Conflicts:
	lib/jekyll/migrators/posterous.rb
@amirmc

This comment has been minimized.

Show comment
Hide comment
@amirmc

amirmc Mar 15, 2012

Is there a way for me to use this script now, so I don't have to wait for it to be merged?

If that's possible, any advice on how to do it would be appreciated.

amirmc commented Mar 15, 2012

Is there a way for me to use this script now, so I don't have to wait for it to be merged?

If that's possible, any advice on how to do it would be appreciated.

@alagu alagu referenced this pull request Oct 4, 2012

Merged

Posterous importer update #651

@alagu

This comment has been minimized.

Show comment
Hide comment
@alagu

alagu Oct 4, 2012

Contributor

I have pulled changes and updated in pull request 651

Contributor

alagu commented Oct 4, 2012

I have pulled changes and updated in pull request 651

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Dec 19, 2012

Member

Updated in #651.

Member

parkr commented Dec 19, 2012

Updated in #651.

@parkr parkr closed this Dec 19, 2012

@jekyllbot jekyllbot locked and limited conversation to collaborators Feb 27, 2017

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