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 45D05E481 for ; Mon, 18 Mar 2013 20:12:19 +0000 (UTC) Received: (qmail 75104 invoked by uid 500); 18 Mar 2013 20:12:18 -0000 Delivered-To: apmail-couchdb-dev-archive@couchdb.apache.org Received: (qmail 75047 invoked by uid 500); 18 Mar 2013 20:12:18 -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 Delivered-To: moderator for dev@couchdb.apache.org Received: (qmail 50728 invoked by uid 99); 18 Mar 2013 20:06:35 -0000 MIME-Version: 1.0 X-Received: by 10.60.41.202 with SMTP id h10mr7308416oel.54.1363637194512; Mon, 18 Mar 2013 13:06:34 -0700 (PDT) Date: Mon, 18 Mar 2013 13:06:34 -0700 Message-ID: Subject: Merging the fauxton branch into master From: Russell Branca To: dev@couchdb.apache.org Content-Type: multipart/alternative; boundary=089e01536d6294e2ac04d838867b --089e01536d6294e2ac04d838867b Content-Type: text/plain; charset=ISO-8859-1 Last week I noticed the fauxton branch and master branch have drifted quite apart, and are a couple hundred commits different in either direction. I created a branch 'fauxton-rebase' [1] that is the fauxton rebased on top of the laster master as of friday. If there are no objections I would like to bring the fauxton-rebase branch into master to simplify development workflow and keeping both branches updated. -Russell [1] https://git-wip-us.apache.org/repos/asf?p=couchdb.git;a=shortlog;h=refs/heads/fauxton-rebase --089e01536d6294e2ac04d838867b--