Update CHANGES & NEWS to reflect COUCHDB-188

2 files changed, 7 insertions, 0 deletions

diff --git a/CHANGES b/CHANGES
index 4be1ef5e7..c3492dda2 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.
diff --git a/NEWS b/NEWS
index ef9af357e..c020912c4 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
 -------------