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 16D1C2009F8 for ; Fri, 3 Jun 2016 17:17:30 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 15C89160A3B; Fri, 3 Jun 2016 15:17:30 +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 AC8A4160A50 for ; Fri, 3 Jun 2016 17:17:28 +0200 (CEST) Received: (qmail 34159 invoked by uid 500); 3 Jun 2016 15:17:26 -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 33592 invoked by uid 99); 3 Jun 2016 15:17:26 -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; Fri, 03 Jun 2016 15:17:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0F7F7E9E9F; Fri, 3 Jun 2016 15:17:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rnewson@apache.org To: commits@couchdb.apache.org Date: Fri, 03 Jun 2016 15:17:51 -0000 Message-Id: In-Reply-To: <7088f4f31da4493b8d77cf6631b794ee@git.apache.org> References: <7088f4f31da4493b8d77cf6631b794ee@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [27/30] couch-replicator commit: updated refs/heads/63012-scheduler-dont-start-immediately to 6a913dc archived-at: Fri, 03 Jun 2016 15:17:30 -0000 Merge pull request #13 from cloudant/63012-handle-duplicate-docs-better Better handling for duplicate replication docs. Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/commit/343e6f7a Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/tree/343e6f7a Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/diff/343e6f7a Branch: refs/heads/63012-scheduler-dont-start-immediately Commit: 343e6f7a6ef3573920caa7873027c012b5eb9c58 Parents: 4dfa279 c79861e Author: Nick Vatamaniuc Authored: Thu Jun 2 17:19:19 2016 -0400 Committer: Nick Vatamaniuc Committed: Thu Jun 2 17:19:19 2016 -0400 ---------------------------------------------------------------------- src/couch_replicator_doc_processor.erl | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) ----------------------------------------------------------------------