Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 030B010859 for ; Fri, 17 Jan 2014 21:55:53 +0000 (UTC) Received: (qmail 87971 invoked by uid 500); 17 Jan 2014 21:55:09 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 86863 invoked by uid 500); 17 Jan 2014 21:54:40 -0000 Mailing-List: contact commits-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 commits@couchdb.apache.org Received: (qmail 85866 invoked by uid 99); 17 Jan 2014 21:54:22 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Jan 2014 21:54:22 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 927943756E; Fri, 17 Jan 2014 21:54:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davisp@apache.org To: commits@couchdb.apache.org Date: Fri, 17 Jan 2014 21:54:45 -0000 Message-Id: <40d77a26a26843039f651c14dfb0c8e9@git.apache.org> In-Reply-To: <088d97ec43f64c3da742f4e6c34505af@git.apache.org> References: <088d97ec43f64c3da742f4e6c34505af@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [27/50] git commit: Merge pull request #34 from cloudant/explicit_zone_placement Merge pull request #34 from cloudant/explicit_zone_placement Explicit zone placement BugzID: 14920 Project: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/commit/b239d17f Tree: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/tree/b239d17f Diff: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/diff/b239d17f Branch: refs/heads/import Commit: b239d17fe3ecd4786f37f5f4de50b1d0f477a356 Parents: 187c798 c37c9a7 Author: Adam Kocoloski Authored: Mon Oct 1 11:51:37 2012 -0700 Committer: Adam Kocoloski Committed: Mon Oct 1 11:51:37 2012 -0700 ---------------------------------------------------------------------- src/mem3.erl | 86 +++++++++++++++++++++++++------------------------- src/mem3_util.erl | 15 +-------- 2 files changed, 44 insertions(+), 57 deletions(-) ----------------------------------------------------------------------