couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kxe...@apache.org
Subject couchdb commit: updated refs/heads/master to 11f726e
Date Wed, 28 May 2014 21:29:18 GMT
Repository: couchdb
Updated Branches:
  refs/heads/master 75fa89c6f -> 11f726ec9


Use "single-master" technical term which inspired by RFC 3384

COUCHDB-2248


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/11f726ec
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/11f726ec
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/11f726ec

Branch: refs/heads/master
Commit: 11f726ec9e690abb5d40cdc77ee3860cbba4ff20
Parents: 75fa89c
Author: Alexander Shorin <kxepal@apache.org>
Authored: Thu May 29 01:28:18 2014 +0400
Committer: Alexander Shorin <kxepal@apache.org>
Committed: Thu May 29 01:28:18 2014 +0400

----------------------------------------------------------------------
 share/doc/src/intro/consistency.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/11f726ec/share/doc/src/intro/consistency.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/intro/consistency.rst b/share/doc/src/intro/consistency.rst
index 96519c3..c104ded 100644
--- a/share/doc/src/intro/consistency.rst
+++ b/share/doc/src/intro/consistency.rst
@@ -280,7 +280,7 @@ consistency between multiple database servers. If a client makes a write
 operation on server `A`, how do we make sure that this is consistent with
 server `B`, or `C`, or `D`? For relational databases, this is a very complex
 problem with entire books devoted to its solution. You could use
-multi-master, master/slave, partitioning, sharding, write-through caches,
+multi-master, single-master, partitioning, sharding, write-through caches,
 and all sorts of other complex techniques.
 
 


Mime
View raw message