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 EDD8F17909 for ; Wed, 4 Feb 2015 15:49:38 +0000 (UTC) Received: (qmail 77288 invoked by uid 500); 4 Feb 2015 15:49:39 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 77158 invoked by uid 500); 4 Feb 2015 15:49:39 -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 76995 invoked by uid 99); 4 Feb 2015 15:49:39 -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; Wed, 04 Feb 2015 15:49:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 95D97E055B; Wed, 4 Feb 2015 15:49:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kxepal@apache.org To: commits@couchdb.apache.org Date: Wed, 04 Feb 2015 15:49:42 -0000 Message-Id: In-Reply-To: <522a27744b5945babe14e806bab8647c@git.apache.org> References: <522a27744b5945babe14e806bab8647c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] couch-replicator commit: updated refs/heads/master to b1c2cc0 Merge remote-tracking branch 'iilyak/2561-make-config-API-consistent' This closes #7 COUCHDB-2561 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/b1c2cc07 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/tree/b1c2cc07 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/diff/b1c2cc07 Branch: refs/heads/master Commit: b1c2cc07300803491658186fa898bab3dc50defc Parents: 4de038d 1fca14a Author: Alexander Shorin Authored: Wed Feb 4 18:43:17 2015 +0300 Committer: Alexander Shorin Committed: Wed Feb 4 18:43:17 2015 +0300 ---------------------------------------------------------------------- src/couch_replicator_manager.erl | 18 ++++++++---------- src/couch_replicator_utils.erl | 10 +++++----- 2 files changed, 13 insertions(+), 15 deletions(-) ----------------------------------------------------------------------