All of lore.kernel.org
 help / color / mirror / Atom feed
From: Wido den Hollander <wido@42on.com>
To: Nathan Cutler <ncutler@suse.cz>, ceph-devel <ceph-devel@vger.kernel.org>
Subject: Re: civetweb upstream/downstream divergence
Date: Thu, 29 Oct 2015 11:11:22 +0100	[thread overview]
Message-ID: <5631F0CA.3010200@42on.com> (raw)
In-Reply-To: <5631E4A5.9020003@suse.cz>



On 29-10-15 10:19, Nathan Cutler wrote:
> Hi Ceph:
> 
> The civetweb code in RGW is taken from https://github.com/ceph/civetweb/
> which is a fork of https://github.com/civetweb/civetweb. The last commit
> to our fork took place on March 18.
> 
> Upstream civetweb development has progressed ("This branch is 19 commits
> ahead, 972 commits behind civetweb:master.")
> 
> Are there plans to rebase to a newer upstream version or should we think
> more in terms of backporting (to ceph/civetweb.git) from upstream
> (civetweb/civetweb.git) when we need to fix bugs or add features?
> 

I think it would be smart to keep tracking civetweb from upstream
otherwise we forked Civetweb.

We might run into some issues with Civetweb which we need to fix
upstream, that's a lot easier if we are close to where upstream is.

Wido

> Thanks and regards
> 

  reply	other threads:[~2015-10-29 10:11 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-29  9:19 civetweb upstream/downstream divergence Nathan Cutler
2015-10-29 10:11 ` Wido den Hollander [this message]
2015-10-29 16:56 ` Loic Dachary
2015-10-29 17:58 ` Yehuda Sadeh-Weinraub
2015-10-30  4:57   ` Pete Zaitcev
2015-10-30  8:00     ` Loic Dachary
2015-10-30 21:38     ` Ken Dreyer
2015-11-02 17:47       ` Martin Millnert
2015-11-03  9:22         ` Nathan Cutler
2015-11-03 11:22           ` Sage Weil
2015-11-04 20:25             ` Ken Dreyer
2015-11-04 23:43               ` Ken Dreyer
2015-11-04 23:54                 ` Sage Weil
2015-11-05  0:04                 ` Martin Millnert

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5631F0CA.3010200@42on.com \
    --to=wido@42on.com \
    --cc=ceph-devel@vger.kernel.org \
    --cc=ncutler@suse.cz \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.