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/1.x.x to c0d5a2f
Date Mon, 10 Nov 2014 17:25:09 GMT
Repository: couchdb
Updated Branches:
  refs/heads/1.x.x 02b02d622 -> c0d5a2fe5


guarantee no longer valid


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

Branch: refs/heads/1.x.x
Commit: c0d5a2fe5ab2345f734c0f33fbf131446a3939d2
Parents: 02b02d6
Author: Robert Newson <rnewson@apache.org>
Authored: Mon Nov 10 16:14:15 2014 +0000
Committer: Alexander Shorin <kxepal@apache.org>
Committed: Mon Nov 10 20:24:56 2014 +0300

----------------------------------------------------------------------
 share/doc/src/replication/conflicts.rst | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/c0d5a2fe/share/doc/src/replication/conflicts.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/replication/conflicts.rst b/share/doc/src/replication/conflicts.rst
index 2d01a8c..2095961 100644
--- a/share/doc/src/replication/conflicts.rst
+++ b/share/doc/src/replication/conflicts.rst
@@ -166,9 +166,7 @@ However there is another mode of working, whereby you specify
 equivalent of a "transaction", but it's not the same as a database transaction
 which can fail and roll back. Rather, it means that all of the changes in the
 request will be forcibly applied to the database, even if that introduces
-conflicts. The only guarantee you are given is that they will either all be
-applied to the database, or none of them (e.g. if the power is pulled out before
-the update is finished writing to disk).
+conflicts.
 
 So this gives you a way to introduce conflicts within a single database
 instance. If you choose to do this instead of PUT, it means you don't have to


Mime
View raw message