Return-Path: X-Original-To: apmail-couchdb-dev-archive@www.apache.org Delivered-To: apmail-couchdb-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0815D1094A for ; Wed, 28 May 2014 21:31:05 +0000 (UTC) Received: (qmail 20523 invoked by uid 500); 28 May 2014 21:31:04 -0000 Delivered-To: apmail-couchdb-dev-archive@couchdb.apache.org Received: (qmail 20469 invoked by uid 500); 28 May 2014 21:31:04 -0000 Mailing-List: contact dev-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 dev@couchdb.apache.org Received: (qmail 20461 invoked by uid 99); 28 May 2014 21:31:04 -0000 Received: from arcas.apache.org (HELO arcas.apache.org) (140.211.11.28) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 May 2014 21:31:04 +0000 Date: Wed, 28 May 2014 21:31:04 +0000 (UTC) From: "Alexander Shorin (JIRA)" To: dev@couchdb.apache.org Message-ID: In-Reply-To: References: Subject: [jira] [Resolved] (COUCHDB-2248) Replace "master" and "slave" terminology MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 [ https://issues.apache.org/jira/browse/COUCHDB-2248?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Alexander Shorin resolved COUCHDB-2248. --------------------------------------- Resolution: Fixed Assignee: Alexander Shorin Fixed in [11f726e|https://git-wip-us.apache.org/repos/asf?p=couchdb.git;a=commit;h=11f726e] > Replace "master" and "slave" terminology > ---------------------------------------- > > Key: COUCHDB-2248 > URL: https://issues.apache.org/jira/browse/COUCHDB-2248 > Project: CouchDB > Issue Type: Bug > Security Level: public(Regular issues) > Components: Documentation > Reporter: Noah Slater > Assignee: Alexander Shorin > Priority: Trivial > > Inspired by the comments on this PR: > https://github.com/django/django/pull/2692 > Summary is: `master` and `slave` are racially charged terms, and it would be good to avoid them. Django have gone for `primary` and `replica`. But we also have to deal with what we now call multi-master setups. I propose "peer to peer" as a replacement, or just "peer" if you're describing one node. > As far as I can tell, the primary work here is the docs. The wiki and any supporting material can be updated after. -- This message was sent by Atlassian JIRA (v6.2#6252)