Skip to content

Update deps for chttpd and couch app#390

Merged
asfgit merged 3 commits into
apache:masterfrom
cloudant:update-chttpd-couch-deps
Mar 11, 2016
Merged

Update deps for chttpd and couch app#390
asfgit merged 3 commits into
apache:masterfrom
cloudant:update-chttpd-couch-deps

Conversation

@eiri
Copy link
Copy Markdown
Member

@eiri eiri commented Mar 11, 2016

This points to the head of both couch-chttpd and couchdb-couch repos to make travis passable for new commits, as tests of the both repos depends on been in sync after CORS refactoring.

@kxepal
Copy link
Copy Markdown
Member

kxepal commented Mar 11, 2016

I would do incremental update one commit per feature. This will simplify searches if something went wrong.

@eiri
Copy link
Copy Markdown
Member Author

eiri commented Mar 11, 2016

Hm. chttpd is seven commits behind, same for couchdb-couch. That makes 3 "features" on couch and 2 on chttpd, as I eyeball git logs. Do you really want 5 separate PRs, consider that this one just became travis green? I mean I can do it, just asking if this is necessary.

@kxepal
Copy link
Copy Markdown
Member

kxepal commented Mar 11, 2016

No, actually here we have two features: one CORS that updates both couch and chttpd, one fix EPI on chttpd. One PR with two commits is fine.

@eiri eiri force-pushed the update-chttpd-couch-deps branch from 46e932f to 27cc092 Compare March 11, 2016 20:01
@eiri
Copy link
Copy Markdown
Member Author

eiri commented Mar 11, 2016

Well, not two, but three, but who's counting, who's counting... ;)

Here we go - one commit per feature.

@kxepal
Copy link
Copy Markdown
Member

kxepal commented Mar 11, 2016

Oh, I didn't check what previous merge contained. Thanks! +1

@kxepal
Copy link
Copy Markdown
Member

kxepal commented Mar 11, 2016

Oh, wait, could you include "da860981c9718ba3a119236edcb01d1b4ad85d65" for replicator in " Remove configurable replicator db name"?

@eiri eiri force-pushed the update-chttpd-couch-deps branch from 27cc092 to c69adca Compare March 11, 2016 20:12
@eiri
Copy link
Copy Markdown
Member Author

eiri commented Mar 11, 2016

Good catch. We sure need something more reliable than wetware to handle this stuff.

@asfgit asfgit merged commit c69adca into apache:master Mar 11, 2016
asfgit pushed a commit that referenced this pull request Mar 11, 2016
This closes #390

Signed-off-by: Eric Avdey <eiri@eiri.ca>
@eiri eiri deleted the update-chttpd-couch-deps branch March 11, 2016 20:48
nickva pushed a commit to nickva/couchdb that referenced this pull request Sep 7, 2022
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.

3 participants