Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 6CE5C200B79 for ; Wed, 24 Aug 2016 00:04:27 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 694BB160AD6; Tue, 23 Aug 2016 22:04:22 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A6E98160AD2 for ; Wed, 24 Aug 2016 00:04:21 +0200 (CEST) Received: (qmail 24271 invoked by uid 500); 23 Aug 2016 22:04:15 -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 24252 invoked by uid 99); 23 Aug 2016 22:04:15 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Aug 2016 22:04:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AE1D3E0441; Tue, 23 Aug 2016 22:04:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: iilyak@apache.org To: commits@couchdb.apache.org Date: Tue, 23 Aug 2016 22:04:16 -0000 Message-Id: <5c365ce6f6ce4a4b9fcf90676449cc86@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] mem3 commit: updated refs/heads/master to 252467c archived-at: Tue, 23 Aug 2016 22:04:27 -0000 Merge remote branch 'cloudant:3102-fix-config_subscription' This closes #25 Signed-off-by: ILYA Khlopotov Project: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/commit/252467cb Tree: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/tree/252467cb Diff: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/diff/252467cb Branch: refs/heads/master Commit: 252467cb4a27637090b5f9006483f5b7ab551699 Parents: 15615b2 432264a Author: ILYA Khlopotov Authored: Tue Aug 23 14:59:49 2016 -0700 Committer: ILYA Khlopotov Committed: Tue Aug 23 14:59:49 2016 -0700 ---------------------------------------------------------------------- src/mem3_shards.erl | 16 ++-- src/mem3_sync_event_listener.erl | 173 +++++++++++++++++++++++++--------- 2 files changed, 138 insertions(+), 51 deletions(-) ----------------------------------------------------------------------