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

Increase delay of defer calls #1253

Merged
merged 2 commits into from May 22, 2015
Merged

Increase delay of defer calls #1253

merged 2 commits into from May 22, 2015

Conversation

dangra
Copy link
Member

@dangra dangra commented May 22, 2015

closes #1075 and #1074

return d

def defer_succeed(result):
"""Same as twsited.internet.defer.succed, but delay calling callback until
"""Same as twsited.internet.defer.succed but delay calling callback until
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo in twisted and succeed

@pablohoffman
Copy link
Member

LGTM, let's fix the minor typos

@dangra
Copy link
Member Author

dangra commented May 22, 2015

fixed.

2015-05-22 19:59 GMT-03:00 Pablo Hoffman notifications@github.com:

LGTM, let's fix the minor typos


Reply to this email directly or view it on GitHub
#1253 (comment).

pablohoffman added a commit that referenced this pull request May 22, 2015
Increase delay of defer calls
@pablohoffman pablohoffman merged commit 8d2531f into 1.0 May 22, 2015
@pablohoffman pablohoffman deleted the deferdelay branch May 22, 2015 23:13
@kmike
Copy link
Member

kmike commented May 22, 2015

Why not push it to master?

Hm, why did we create 1.0 branch? In past we were branching when a bug-fix release was needed, no?

@dangra
Copy link
Member Author

dangra commented May 23, 2015

Why not push it to master?

do you mean pushing to master and backporting to 1.0?

I wasn't sure what option to follow, pushing to 1.0 and porting to master or the other way. I think in the past we pushed to master and backported which makes more sense now that I think.

I will port it to master now.

Hm, why did we create 1.0 branch? In past we were branching when a bug-fix release was needed, no?

No, in the past we created a branch for every next stable release and released bugfixes from that branch. The release procedure is described at https://github.com/scrapy/scrapy/wiki/Scrapy-release-procedure#version-and-git-branch

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

4 participants