[3/3] git commit: Update CHANGES & NEWS to reflect COUCHDB-188

[fd...@apache.org]

Update CHANGES & NEWS to reflect COUCHDB-188


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

Branch: refs/heads/master
Commit: 975ea08c719bc6a457fb407225dbdf772764b13c
Parents: 6d1d23b
Author: Filipe David Borba Manana <fd...@apache.org>
Authored: Fri Jan 6 13:18:04 2012 +0000
Committer: Filipe David Borba Manana <fd...@apache.org>
Committed: Sat Jan 7 12:46:04 2012 +0000

----------------------------------------------------------------------
 CHANGES |    5 +++++
 NEWS    |    2 ++
 2 files changed, 7 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/975ea08c/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 4be1ef5..c3492dd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,11 @@ Source Repository:
 
  * The source repository was migrated from SVN to Git.
 
+Storage System:
+
+ * Fixed unnecessary conflict when deleting and creating a
+   document in the same batch.
+
 View Server:
 
  * Speedup in the communication with external view servers.

http://git-wip-us.apache.org/repos/asf/couchdb/blob/975ea08c/NEWS
----------------------------------------------------------------------
diff --git a/NEWS b/NEWS
index ef9af35..c020912 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,8 @@ This version has not been released yet.
  * The source code repository was migrated from SVN to Git.
  * Added view request duration to Futon.
  * Speedup in the communication with external view servers.
+ * Fixed unnecessary conflict when deleting and creating a
+   document in the same batch.
 
 Version 1.2.0
 -------------