couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject documentation commit: updated refs/heads/master to be839be
Date Mon, 10 Nov 2014 16:15:08 GMT
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master 332c40bff -> be839be22


guarantee no longer valid


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

Branch: refs/heads/master
Commit: be839be222df5fd876a5225850d23d8972a05d10
Parents: 332c40b
Author: Robert Newson <rnewson@apache.org>
Authored: Mon Nov 10 16:14:15 2014 +0000
Committer: Robert Newson <rnewson@apache.org>
Committed: Mon Nov 10 16:14:18 2014 +0000

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


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/be839be2/src/replication/conflicts.rst
----------------------------------------------------------------------
diff --git a/src/replication/conflicts.rst b/src/replication/conflicts.rst
index 2d01a8c..2095961 100644
--- a/src/replication/conflicts.rst
+++ b/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