search

midokura / neutron

Quantum is a virtual network service for Openstack, and a part of Netstack.
http://openstack.org
Apache License 2.0
2 stars 3 forks source link

bp/bgp_dynamic_routing (rebased on top of the upstream) #118

Closed tfukushima closed 10 years ago

tfukushima commented 10 years ago

@jdevesa I just tested if our branch can be merged with the current master. But we can't.

Let's make sure that bp/bgp-dynamic-routing branch keeps up to date always rebasing on top of the upstream master. For the tentative effort, I'll create the up-to-date bp/bgp-dynamic-routing-upstream branch, which would be updated every day.

devvesa commented 10 years ago

Hi Taku,

The branch is not necessary. I use to do this periodically. I'll do it today fixing the conflicts as soon as I'll arrive at the office. Thanks for the hands up.

On Friday, August 1, 2014, Taku Fukushima notifications@github.com wrote:

@jdevesa https://github.com/jdevesa I just tested if our branch can be merged with the current master. But we can't.

Let's make sure that bp/bgp-dynamic-routing branch keeps up to date always rebasing on top of the upstream master. For the tentative effort, I'll create the up-to-date bp/bgp-dynamic-routing-upstream branch, which would be updated every day.

— Reply to this email directly or view it on GitHub https://github.com/midokura/neutron/pull/118#issuecomment-50845578.

Jaume Devesa Software Engineer at Midokura