Update CHANGES and NEWS before the 1.0.2 release.

git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.0.x@1061083 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 12 insertions, 0 deletions

diff --git a/CHANGES b/CHANGES
index bfabc018..fdfd31d2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,8 @@ Futon:
 
  * Make test suite work with Safari and Chrome.
  * Fixed animated progress spinner.
+ * Fix raw view document link due to overzealous URI encoding.
+ * Spell javascript correctly in loadScript(uri).
 
 Storage System:
 
@@ -18,6 +20,9 @@ Storage System:
  * Fix occasional timeout errors on systems with slow or heavily loaded IO.
  * Fix for OOME when compactions include documents with many conflicts.
  * Fix for missing attachment compression when MIME types included parameters.
+ * Preserve purge metadata during compaction to avoid spurious view rebuilds.
+ * Fix spurious conflicts introduced when uploading an attachment after
+   a doc has been in a conflict. See COUCHDB-902 for details.
  * Fix for frequently edited documents in multi-master deployments being
    duplicated in _changes and _all_docs.  See COUCHDDB-968 for details on how
    to repair.
@@ -33,6 +38,8 @@ HTTP Interface:
 
  * Allow reduce=false parameter in map-only views.
  * Fix parsing of Accept headers.
+ * Fix for multipart GET APIs when an attachment was created during a
+   local-local replication. See COUCHDB-1022 for details.
 
 Replicator:
 
diff --git a/NEWS b/NEWS
index 1a70a0f1..9550856e 100644
--- a/NEWS
+++ b/NEWS
@@ -18,11 +18,16 @@ Version 1.0.2
  * Allow logging of native <xml> types.
  * Updated ibrowse library to 2.1.2 fixing numerous replication issues.
  * Fix authenticated replication of design documents with attachments.
+ * Fix multipart GET APIs by always sending attachments in compressed
+   form when the source attachment is compressed on disk. Fixes a possible
+   edge case when an attachment underwent local-local replication.
  * Various fixes to make replicated more resilient for edge-cases.
  * Don't trigger a view update when requesting `_design/doc/_info`.
  * Fix for circular references in CommonJS requires.
  * Fix for frequently edited documents in multi-master deployments being
    duplicated in _changes and _all_docs.
+ * Fix spurious conflict generation during attachment uploads.
+ * Fix for various bugs in Futon.
 
 Version 1.0.1
 -------------