search

projectcalico / bird

Calico's fork of the BIRD protocol stack
90 stars 86 forks source link

Merge with upstream projects ? #56

Closed darkweaver87 closed 4 years ago

darkweaver87 commented 6 years ago

Hello,

It's an open question :-) I think it would be better to merge with upstream projects (by doing PR) because on long term view you won't benefit from the commits of people maintaining those projects and you'll eventually face merging conflicts. You already forked bird, confd and etcd and I don't think creating other projects is necessary for the minor modifications/ additional features you made to make the glue around calico project.

Thanks :-)

Rémi

caseydavenport commented 6 years ago

@darkweaver87 as far as etcd goes, we've submitted a PR and we're waiting to see if it will be approved. We plan on going back to the upstream version ASAP :)

For confd, we've made substantial changes and I don't think it makes sense to try to merge them back upstream.

@neiljerram are you the right person to comment on the feasibility of merging bird with upstream?

nelljerram commented 6 years ago

@neiljerram are you the right person to comment on the feasibility of merging bird with upstream?

@caseydavenport @darkweaver87 Yes, it is absolutely feasible for us to merge back with upstream bird, and I would love us to do that. I raised that on the BIRD mailing list a while ago and got an encouraging response. It's just that there's a little work needed that we haven't yet got round to.