Return-Path: X-Original-To: apmail-couchdb-dev-archive@www.apache.org Delivered-To: apmail-couchdb-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4E05A10F36 for ; Sun, 15 Dec 2013 17:31:08 +0000 (UTC) Received: (qmail 19675 invoked by uid 500); 15 Dec 2013 17:31:07 -0000 Delivered-To: apmail-couchdb-dev-archive@couchdb.apache.org Received: (qmail 19632 invoked by uid 500); 15 Dec 2013 17:31:07 -0000 Mailing-List: contact dev-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list dev@couchdb.apache.org Received: (qmail 19545 invoked by uid 99); 15 Dec 2013 17:31:07 -0000 Received: from arcas.apache.org (HELO arcas.apache.org) (140.211.11.28) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 15 Dec 2013 17:31:07 +0000 Date: Sun, 15 Dec 2013 17:31:07 +0000 (UTC) From: "Jan Lehnardt (JIRA)" To: dev@couchdb.apache.org Message-ID: In-Reply-To: References: Subject: [jira] [Created] (COUCHDB-1999) Merge BigCouch and rcouch MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 Jan Lehnardt created COUCHDB-1999: ------------------------------------- Summary: Merge BigCouch and rcouch Key: COUCHDB-1999 URL: https://issues.apache.org/jira/browse/COUCHDB-1999 Project: CouchDB Issue Type: New Feature Reporter: Jan Lehnardt This issue is the master issue to track the BigCouch and rcouch. {noformat} rebase nebraska master done +-------x----+------+--------+------------X-------------------> | | | | + | | | | | integration | v v v v +-------x----------------------------------------+------------> | ^ ^ ^ ^ ^ | | | | | | | | rcouch | | | | | + | +-------x-+----+-------+-----------+------X------|------------> | | | | master | | +-------x----------------------------------------v------------> merge to master {noformat}=E2=80=99 via http://www.asciiflow.com/#Draw3086755538105541081/1497478309 1. nebraska and rcouch branches rebase from master from tag merge-rebase-ta= rget / d5f0976. 2. nebraska continues with its work and periodically pushes to integration. 3. rcouch continues with its work and periodically pushes to integration. 4. at point `done`, both rcouch and nebraska can verify all their stuff wor= ks. 5. at point `merge to master` the end result goes into CouchDB master and w= e can make a release. Please link all related issues with this one. -- This message was sent by Atlassian JIRA (v6.1.4#6159)