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 D9164200C82 for ; Fri, 12 May 2017 17:33:12 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D7D11160BA3; Fri, 12 May 2017 15:33:12 +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 3486B160BB8 for ; Fri, 12 May 2017 17:33:12 +0200 (CEST) Received: (qmail 31221 invoked by uid 500); 12 May 2017 15:33:11 -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 31194 invoked by uid 99); 12 May 2017 15:33:11 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 May 2017 15:33:11 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 14511812EC; Fri, 12 May 2017 15:33:09 +0000 (UTC) Date: Fri, 12 May 2017 15:33:13 +0000 To: "commits@couchdb.apache.org" Subject: [couchdb] 04/05: Add clause for mixed cluster upgrades MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: davisp@apache.org Reply-To: "commits@couchdb.apache.org" In-Reply-To: <149460318958.22880.18349149377464029670@gitbox.apache.org> References: <149460318958.22880.18349149377464029670@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: couchdb X-Git-Refname: refs/heads/COUCHDB-3288-mixed-cluster-upgrade X-Git-Reftype: branch X-Git-Rev: 7b1a3498e550df8309499b37fa7028aba8257c58 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.3.dev Auto-Submitted: auto-generated Message-Id: <20170512153310.14511812EC@gitbox.apache.org> archived-at: Fri, 12 May 2017 15:33:13 -0000 This is an automated email from the ASF dual-hosted git repository. davisp pushed a commit to branch COUCHDB-3288-mixed-cluster-upgrade in repository https://gitbox.apache.org/repos/asf/couchdb.git commit 7b1a3498e550df8309499b37fa7028aba8257c58 Author: Paul J. Davis AuthorDate: Tue Apr 25 11:21:54 2017 -0500 Add clause for mixed cluster upgrades A mixed cluster (i.e., during a rolling reboot) will want to include this commit in a release before deploying PSE code to avoid spurious erros during the upgrade. COUCHDB-3288 --- src/fabric/src/fabric_rpc.erl | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/fabric/src/fabric_rpc.erl b/src/fabric/src/fabric_rpc.erl index de4b470..ad96255 100644 --- a/src/fabric/src/fabric_rpc.erl +++ b/src/fabric/src/fabric_rpc.erl @@ -16,8 +16,9 @@ -export([open_doc/3, open_revs/4, get_doc_info/3, get_full_doc_info/3, get_missing_revs/2, get_missing_revs/3, update_docs/3]). -export([all_docs/3, changes/3, map_view/4, reduce_view/4, group_info/2]). --export([create_db/1, delete_db/1, reset_validation_funs/1, set_security/3, - set_revs_limit/3, create_shard_db_doc/2, delete_shard_db_doc/2]). +-export([create_db/1, create_db/2, delete_db/1, reset_validation_funs/1, + set_security/3, set_revs_limit/3, create_shard_db_doc/2, + delete_shard_db_doc/2]). -export([get_all_security/2, open_shard/2]). -export([compact/1, compact/2]). @@ -145,7 +146,10 @@ fix_skip_and_limit(Args) -> Args#mrargs{skip=0, limit=Skip+Limit}. create_db(DbName) -> - rexi:reply(case couch_server:create(DbName, []) of + create_db(DbName, []). + +create_db(DbName, Options) -> + rexi:reply(case couch_server:create(DbName, Options) of {ok, _} -> ok; Error -> -- To stop receiving notification emails like this one, please contact "commits@couchdb.apache.org" .