You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/05/06 18:41:44 UTC

[1/7] git commit: Versions and NEWS update for 2.0.8 release

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 aa3c10dd0 -> 3d62a5530
  refs/heads/trunk 754643c5e -> aae8d8cc7


Versions and NEWS update for 2.0.8 release


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

Branch: refs/heads/cassandra-2.1
Commit: 006853300fe9c3dc3e62e224a8d00cb7609b0ad6
Parents: 69e65be
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue May 6 10:29:53 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue May 6 10:29:53 2014 +0200

----------------------------------------------------------------------
 .rat-excludes    |  1 +
 NEWS.txt         | 13 +++++++++++++
 build.xml        |  2 +-
 debian/changelog |  6 ++++++
 4 files changed, 21 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/00685330/.rat-excludes
----------------------------------------------------------------------
diff --git a/.rat-excludes b/.rat-excludes
index 871f5df..0da5ab9 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -5,6 +5,7 @@ debian/**
 **/.project
 **/.pydevproject
 CHANGES.txt
+README.asc
 .git/**
 **/*.json
 **/*.patch

http://git-wip-us.apache.org/repos/asf/cassandra/blob/00685330/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 05f9392..04fa986 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -13,6 +13,19 @@ restore snapshots created with the previous major version using the
 'sstableloader' tool. You can upgrade the file format of your snapshots
 using the provided 'sstableupgrade' tool.
 
+2.0.8
+=====
+
+New features
+------------
+    - New snitches have been used for users of Google Compute Engine and of
+      Cloudstack.
+
+Upgrading
+---------
+    - Nothing specific to this release, but please see 2.0.8 if you are upgrading
+      from a previous version.
+
 
 2.0.7
 =====

http://git-wip-us.apache.org/repos/asf/cassandra/blob/00685330/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 62f980a..5cd47a6 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
     <property name="debuglevel" value="source,lines,vars"/>
 
     <!-- default version and SCM information -->
-    <property name="base.version" value="2.0.7"/>
+    <property name="base.version" value="2.0.8"/>
     <property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/>
     <property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/>
     <property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>

http://git-wip-us.apache.org/repos/asf/cassandra/blob/00685330/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 37c7425..1ab0b75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.0.8) unstable; urgency=medium
+
+  * New release
+
+ -- Sylvain Lebresne <sl...@apache.org>  Tue, 06 May 2014 10:28:46 +0200
+
 cassandra (2.0.7) unstable; urgency=low
 
   * New release


[4/7] git commit: fix changes/news

Posted by br...@apache.org.
fix changes/news


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

Branch: refs/heads/cassandra-2.1
Commit: 8d93c1fcba4112956d10c90560471eaba84c64c9
Parents: 0068533
Author: Brandon Williams <br...@apache.org>
Authored: Tue May 6 11:27:32 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue May 6 11:27:32 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt | 8 ++++----
 NEWS.txt    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d93c1fc/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 25a5cc1..d65a694 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -22,10 +22,6 @@ Merged from 1.2:
  * Fix schema concurrency exceptions (CASSANDRA-6841)
  * Fix BatchlogManager#deleteBatch() use of millisecond timsestamps
    (CASSANDRA-6822)
- * Continue assassinating even if the endpoint vanishes (CASSANDRA-6787)
- * Schedule schema pulls on change (CASSANDRA-6971)
- * Non-droppable verbs shouldn't be dropped from OTC (CASSANDRA-6980)
- * Shutdown batchlog executor in SS#drain() (CASSANDRA-7025)
  * Fix batchlog to account for CF truncation records (CASSANDRA-6999)
  * Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018)
  * Require nodetool rebuild_index to specify index names (CASSANDRA-7038)
@@ -38,6 +34,10 @@ Merged from 1.2:
 
 2.0.7
  * Put nodes in hibernate when join_ring is false (CASSANDRA-6961)
+ * Continue assassinating even if the endpoint vanishes (CASSANDRA-6787)
+ * Non-droppable verbs shouldn't be dropped from OTC (CASSANDRA-6980)
+ * Shutdown batchlog executor in SS#drain() (CASSANDRA-7025)
+ * Schedule schema pulls on change (CASSANDRA-6971)
  * Avoid early loading of non-system keyspaces before compaction-leftovers 
    cleanup at startup (CASSANDRA-6913)
  * Restrict Windows to parallel repairs (CASSANDRA-6907)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d93c1fc/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 04fa986..35e48d6 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -23,7 +23,7 @@ New features
 
 Upgrading
 ---------
-    - Nothing specific to this release, but please see 2.0.8 if you are upgrading
+    - Nothing specific to this release, but please see 2.0.7 if you are upgrading
       from a previous version.
 
 


[2/7] git commit: Versions and NEWS update for 2.0.8 release

Posted by br...@apache.org.
Versions and NEWS update for 2.0.8 release


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

Branch: refs/heads/trunk
Commit: 006853300fe9c3dc3e62e224a8d00cb7609b0ad6
Parents: 69e65be
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue May 6 10:29:53 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue May 6 10:29:53 2014 +0200

----------------------------------------------------------------------
 .rat-excludes    |  1 +
 NEWS.txt         | 13 +++++++++++++
 build.xml        |  2 +-
 debian/changelog |  6 ++++++
 4 files changed, 21 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/00685330/.rat-excludes
----------------------------------------------------------------------
diff --git a/.rat-excludes b/.rat-excludes
index 871f5df..0da5ab9 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -5,6 +5,7 @@ debian/**
 **/.project
 **/.pydevproject
 CHANGES.txt
+README.asc
 .git/**
 **/*.json
 **/*.patch

http://git-wip-us.apache.org/repos/asf/cassandra/blob/00685330/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 05f9392..04fa986 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -13,6 +13,19 @@ restore snapshots created with the previous major version using the
 'sstableloader' tool. You can upgrade the file format of your snapshots
 using the provided 'sstableupgrade' tool.
 
+2.0.8
+=====
+
+New features
+------------
+    - New snitches have been used for users of Google Compute Engine and of
+      Cloudstack.
+
+Upgrading
+---------
+    - Nothing specific to this release, but please see 2.0.8 if you are upgrading
+      from a previous version.
+
 
 2.0.7
 =====

http://git-wip-us.apache.org/repos/asf/cassandra/blob/00685330/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 62f980a..5cd47a6 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
     <property name="debuglevel" value="source,lines,vars"/>
 
     <!-- default version and SCM information -->
-    <property name="base.version" value="2.0.7"/>
+    <property name="base.version" value="2.0.8"/>
     <property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/>
     <property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/>
     <property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>

http://git-wip-us.apache.org/repos/asf/cassandra/blob/00685330/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 37c7425..1ab0b75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.0.8) unstable; urgency=medium
+
+  * New release
+
+ -- Sylvain Lebresne <sl...@apache.org>  Tue, 06 May 2014 10:28:46 +0200
+
 cassandra (2.0.7) unstable; urgency=low
 
   * New release


[3/7] git commit: fix changes/news

Posted by br...@apache.org.
fix changes/news


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

Branch: refs/heads/trunk
Commit: 8d93c1fcba4112956d10c90560471eaba84c64c9
Parents: 0068533
Author: Brandon Williams <br...@apache.org>
Authored: Tue May 6 11:27:32 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue May 6 11:27:32 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt | 8 ++++----
 NEWS.txt    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d93c1fc/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 25a5cc1..d65a694 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -22,10 +22,6 @@ Merged from 1.2:
  * Fix schema concurrency exceptions (CASSANDRA-6841)
  * Fix BatchlogManager#deleteBatch() use of millisecond timsestamps
    (CASSANDRA-6822)
- * Continue assassinating even if the endpoint vanishes (CASSANDRA-6787)
- * Schedule schema pulls on change (CASSANDRA-6971)
- * Non-droppable verbs shouldn't be dropped from OTC (CASSANDRA-6980)
- * Shutdown batchlog executor in SS#drain() (CASSANDRA-7025)
  * Fix batchlog to account for CF truncation records (CASSANDRA-6999)
  * Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018)
  * Require nodetool rebuild_index to specify index names (CASSANDRA-7038)
@@ -38,6 +34,10 @@ Merged from 1.2:
 
 2.0.7
  * Put nodes in hibernate when join_ring is false (CASSANDRA-6961)
+ * Continue assassinating even if the endpoint vanishes (CASSANDRA-6787)
+ * Non-droppable verbs shouldn't be dropped from OTC (CASSANDRA-6980)
+ * Shutdown batchlog executor in SS#drain() (CASSANDRA-7025)
+ * Schedule schema pulls on change (CASSANDRA-6971)
  * Avoid early loading of non-system keyspaces before compaction-leftovers 
    cleanup at startup (CASSANDRA-6913)
  * Restrict Windows to parallel repairs (CASSANDRA-6907)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d93c1fc/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 04fa986..35e48d6 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -23,7 +23,7 @@ New features
 
 Upgrading
 ---------
-    - Nothing specific to this release, but please see 2.0.8 if you are upgrading
+    - Nothing specific to this release, but please see 2.0.7 if you are upgrading
       from a previous version.
 
 


[6/7] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	NEWS.txt
	build.xml
	debian/changelog


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

Branch: refs/heads/cassandra-2.1
Commit: 3d62a553032a65c298c1871aab2f47ca397fe703
Parents: aa3c10d 8d93c1f
Author: Brandon Williams <br...@apache.org>
Authored: Tue May 6 11:37:43 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue May 6 11:37:43 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt |  6 +++++-
 NEWS.txt    | 12 ++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d62a553/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 553f764,d65a694..88ff5d2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,83 -1,43 +1,87 @@@
 -2.0.8
 +2.1.0-rc1
 + * Parallel streaming for sstableloader (CASSANDRA-3668)
 + * Fix bugs in supercolumns handling (CASSANDRA-7138)
 + * Fix ClassClassException on composite dense tables (CASSANDRA-7112)
 + * Cleanup and optimize collation and slice iterators (CASSANDRA-7107)
++ * Upgrade NBHM lib (CASSANDRA-7128) 
 +Merged from 2.0:
   * Correctly delete scheduled range xfers (CASSANDRA-7143)
   * Make batchlog replica selection rack-aware (CASSANDRA-6551)
 - * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072)
 - * Set JMX RMI port to 7199 (CASSANDRA-7087)
 - * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939)
 - * Log a warning for large batches (CASSANDRA-6487)
 - * Queries on compact tables can return more rows that requested (CASSANDRA-7052)
 - * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
 - * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
 - * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047)
 - * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074)
 - * Plug holes in resource release when wiring up StreamSession (CASSANDRA-7073)
 - * Re-add parameter columns to tracing session (CASSANDRA-6942)
 - * Fix writetime/ttl functions for static columns (CASSANDRA-7081)
   * Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142)
  Merged from 1.2:
   * Add Cloudstack snitch (CASSANDRA-7147)
   * Update system.peers correctly when relocating tokens (CASSANDRA-7126)
   * Add Google Compute Engine snitch (CASSANDRA-7132)
-  * Upgrade NBHM lib (CASSANDRA-7128) 
 - * Fix nodetool display with vnodes (CASSANDRA-7082)
 - * Fix schema concurrency exceptions (CASSANDRA-6841)
 - * Fix BatchlogManager#deleteBatch() use of millisecond timsestamps
 -   (CASSANDRA-6822)
 - * Fix batchlog to account for CF truncation records (CASSANDRA-6999)
 - * Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018)
 - * Require nodetool rebuild_index to specify index names (CASSANDRA-7038)
 - * Ensure that batchlog and hint timeouts do not produce hints (CASSANDRA-7058)
 - * Always clean up references in SerializingCache (CASSANDRA-6994)
 - * Don't shut MessagingService down when replacing a node (CASSANDRA-6476)
 - * fix npe when doing -Dcassandra.fd_initial_value_ms (CASSANDRA-6751)
 - * Preserves CQL metadata when updating table from thrift (CASSANDRA-6831)
  
 -
 -2.0.7
 +2.1.0-beta2
 + * Increase default CL space to 8GB (CASSANDRA-7031)
 + * Add range tombstones to read repair digests (CASSANDRA-6863)
 + * Fix BTree.clear for large updates (CASSANDRA-6943)
 + * Fail write instead of logging a warning when unable to append to CL
 +   (CASSANDRA-6764)
 + * Eliminate possibility of CL segment appearing twice in active list 
 +   (CASSANDRA-6557)
 + * Apply DONTNEED fadvise to commitlog segments (CASSANDRA-6759)
 + * Switch CRC component to Adler and include it for compressed sstables 
 +   (CASSANDRA-4165)
 + * Allow cassandra-stress to set compaction strategy options (CASSANDRA-6451)
 + * Add broadcast_rpc_address option to cassandra.yaml (CASSANDRA-5899)
 + * Auto reload GossipingPropertyFileSnitch config (CASSANDRA-5897)
 + * Fix overflow of memtable_total_space_in_mb (CASSANDRA-6573)
 + * Fix ABTC NPE and apply update function correctly (CASSANDRA-6692)
 + * Allow nodetool to use a file or prompt for password (CASSANDRA-6660)
 + * Fix AIOOBE when concurrently accessing ABSC (CASSANDRA-6742)
 + * Fix assertion error in ALTER TYPE RENAME (CASSANDRA-6705)
 + * Scrub should not always clear out repaired status (CASSANDRA-5351)
 + * Improve handling of range tombstone for wide partitions (CASSANDRA-6446)
 + * Fix ClassCastException for compact table with composites (CASSANDRA-6738)
 + * Fix potentially repairing with wrong nodes (CASSANDRA-6808)
 + * Change caching option syntax (CASSANDRA-6745)
 + * Fix stress to do proper counter reads (CASSANDRA-6835)
 + * Fix help message for stress counter_write (CASSANDRA-6824)
 + * Fix stress smart Thrift client to pick servers correctly (CASSANDRA-6848)
 + * Add logging levels (minimal, normal or verbose) to stress tool (CASSANDRA-6849)
 + * Fix race condition in Batch CLE (CASSANDRA-6860)
 + * Improve cleanup/scrub/upgradesstables failure handling (CASSANDRA-6774)
 + * ByteBuffer write() methods for serializing sstables (CASSANDRA-6781)
 + * Proper compare function for CollectionType (CASSANDRA-6783)
 + * Update native server to Netty 4 (CASSANDRA-6236)
 + * Fix off-by-one error in stress (CASSANDRA-6883)
 + * Make OpOrder AutoCloseable (CASSANDRA-6901)
 + * Remove sync repair JMX interface (CASSANDRA-6900)
 + * Add multiple memory allocation options for memtables (CASSANDRA-6689, 6694)
 + * Remove adjusted op rate from stress output (CASSANDRA-6921)
 + * Add optimized CF.hasColumns() implementations (CASSANDRA-6941)
 + * Serialize batchlog mutations with the version of the target node
 +   (CASSANDRA-6931)
 + * Optimize CounterColumn#reconcile() (CASSANDRA-6953)
 + * Properly remove 1.2 sstable support in 2.1 (CASSANDRA-6869)
 + * Lock counter cells, not partitions (CASSANDRA-6880)
 + * Track presence of legacy counter shards in sstables (CASSANDRA-6888)
 + * Ensure safe resource cleanup when replacing sstables (CASSANDRA-6912)
 + * Add failure handler to async callback (CASSANDRA-6747)
 + * Fix AE when closing SSTable without releasing reference (CASSANDRA-7000)
 + * Clean up IndexInfo on keyspace/table drops (CASSANDRA-6924)
 + * Only snapshot relative SSTables when sequential repair (CASSANDRA-7024)
 + * Require nodetool rebuild_index to specify index names (CASSANDRA-7038)
 + * fix cassandra stress errors on reads with native protocol (CASSANDRA-7033)
 + * Use OpOrder to guard sstable references for reads (CASSANDRA-6919)
 + * Preemptive opening of compaction result (CASSANDRA-6916)
 + * Multi-threaded scrub/cleanup/upgradesstables (CASSANDRA-5547)
 + * Optimize cellname comparison (CASSANDRA-6934)
 + * Native protocol v3 (CASSANDRA-6855)
 + * Optimize Cell liveness checks and clean up Cell (CASSANDRA-7119)
 + * Support consistent range movements (CASSANDRA-2434)
 +Merged from 2.0:
 + * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072)
 + * Set JMX RMI port to 7199 (CASSANDRA-7087)
 + * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939)
 + * Log a warning for large batches (CASSANDRA-6487)
   * Put nodes in hibernate when join_ring is false (CASSANDRA-6961)
+  * Continue assassinating even if the endpoint vanishes (CASSANDRA-6787)
+  * Non-droppable verbs shouldn't be dropped from OTC (CASSANDRA-6980)
+  * Shutdown batchlog executor in SS#drain() (CASSANDRA-7025)
+  * Schedule schema pulls on change (CASSANDRA-6971)
   * Avoid early loading of non-system keyspaces before compaction-leftovers 
     cleanup at startup (CASSANDRA-6913)
   * Restrict Windows to parallel repairs (CASSANDRA-6907)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d62a553/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index 5d59460,35e48d6..ff7b98d
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,52 -13,20 +13,64 @@@ restore snapshots created with the prev
  'sstableloader' tool. You can upgrade the file format of your snapshots
  using the provided 'sstableupgrade' tool.
  
 +2.1
 +===
 +
 +New features
 +------------
 +   - SSTable data directory name is slightly changed. Each directory will
 +     have hex string appended after CF name, e.g.
 +         ks/cf-5be396077b811e3a3ab9dc4b9ac088d/
 +     This hex string part represents unique ColumnFamily ID.
 +     Note that existing directories are used as is, so only newly created
 +     directories after upgrade have new directory name format.
 +   - Saved key cache files also have ColumnFamily ID in their file name.
 +   - It is now possible to do incremental repairs, sstables that have been
 +     repaired are marked with a timestamp and not included in the next
 +     repair session. Use nodetool repair -par -inc to use this feature.
 +     A tool to manually mark/unmark sstables as repaired is available in
 +     tools/bin/sstablerepairedset.
 +   - Bootstrapping now ensures that range movements are consistent,
 +     meaning the data for the new node is taken from the node that is no 
 +     longer a responsible for that range of keys.  
 +     If you want the old behavior (due to a lost node perhaps)
 +     you can set the following property (-Dconsistent.rangemovement=false)
 +
 +Upgrading
 +---------
 +   - Rolling upgrades from anything pre-2.0.7 is not supported. Furthermore
 +     pre-2.0 sstables are not supported. This means that before upgrading
 +     a node on 2.1, this node must be started on 2.0 and
 +     'nodetool upgdradesstables' must be run (and this even in the case
 +     of not-rolling upgrades).
 +   - For size-tiered compaction users, Cassandra now defaults to ignoring
 +     the coldest 5% of sstables.  This can be customized with the
 +     cold_reads_to_omit compaction option; 0.0 omits nothing (the old
 +     behavior) and 1.0 omits everything.
 +   - Multithreaded compaction has been removed.
 +   - Counters implementation has been changed, replaced by a safer one with
 +     less caveats, but different performance characteristics. You might have
 +     to change your data model to accomodate the new implementation.
 +     (See https://issues.apache.org/jira/browse/CASSANDRA-6504 and the dev
 +     blog post at http://www.datastax.com/dev/blog/<PLACEHOLDER> for details).
 +   - (per-table) index_interval parameter has been replaced with
 +     min_index_interval and max_index_interval paratemeters. index_interval
 +     has been deprecated.
 +   - support for supercolumns has been removed from json2sstable
 +
+ 2.0.8
+ =====
+ 
+ New features
+ ------------
+     - New snitches have been used for users of Google Compute Engine and of
+       Cloudstack.
+ 
+ Upgrading
+ ---------
+     - Nothing specific to this release, but please see 2.0.7 if you are upgrading
+       from a previous version.
  
 -
  2.0.7
  =====
  


[7/7] git commit: Merge branch 'cassandra-2.1' into trunk

Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: aae8d8cc7491d5f255c876668939a7a46b51bf76
Parents: 754643c 3d62a55
Author: Brandon Williams <br...@apache.org>
Authored: Tue May 6 11:37:53 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue May 6 11:37:53 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt |  6 +++++-
 NEWS.txt    | 12 ++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/aae8d8cc/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/aae8d8cc/NEWS.txt
----------------------------------------------------------------------


[5/7] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	NEWS.txt
	build.xml
	debian/changelog


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

Branch: refs/heads/trunk
Commit: 3d62a553032a65c298c1871aab2f47ca397fe703
Parents: aa3c10d 8d93c1f
Author: Brandon Williams <br...@apache.org>
Authored: Tue May 6 11:37:43 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue May 6 11:37:43 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt |  6 +++++-
 NEWS.txt    | 12 ++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d62a553/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 553f764,d65a694..88ff5d2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,83 -1,43 +1,87 @@@
 -2.0.8
 +2.1.0-rc1
 + * Parallel streaming for sstableloader (CASSANDRA-3668)
 + * Fix bugs in supercolumns handling (CASSANDRA-7138)
 + * Fix ClassClassException on composite dense tables (CASSANDRA-7112)
 + * Cleanup and optimize collation and slice iterators (CASSANDRA-7107)
++ * Upgrade NBHM lib (CASSANDRA-7128) 
 +Merged from 2.0:
   * Correctly delete scheduled range xfers (CASSANDRA-7143)
   * Make batchlog replica selection rack-aware (CASSANDRA-6551)
 - * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072)
 - * Set JMX RMI port to 7199 (CASSANDRA-7087)
 - * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939)
 - * Log a warning for large batches (CASSANDRA-6487)
 - * Queries on compact tables can return more rows that requested (CASSANDRA-7052)
 - * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
 - * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
 - * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047)
 - * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074)
 - * Plug holes in resource release when wiring up StreamSession (CASSANDRA-7073)
 - * Re-add parameter columns to tracing session (CASSANDRA-6942)
 - * Fix writetime/ttl functions for static columns (CASSANDRA-7081)
   * Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142)
  Merged from 1.2:
   * Add Cloudstack snitch (CASSANDRA-7147)
   * Update system.peers correctly when relocating tokens (CASSANDRA-7126)
   * Add Google Compute Engine snitch (CASSANDRA-7132)
-  * Upgrade NBHM lib (CASSANDRA-7128) 
 - * Fix nodetool display with vnodes (CASSANDRA-7082)
 - * Fix schema concurrency exceptions (CASSANDRA-6841)
 - * Fix BatchlogManager#deleteBatch() use of millisecond timsestamps
 -   (CASSANDRA-6822)
 - * Fix batchlog to account for CF truncation records (CASSANDRA-6999)
 - * Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018)
 - * Require nodetool rebuild_index to specify index names (CASSANDRA-7038)
 - * Ensure that batchlog and hint timeouts do not produce hints (CASSANDRA-7058)
 - * Always clean up references in SerializingCache (CASSANDRA-6994)
 - * Don't shut MessagingService down when replacing a node (CASSANDRA-6476)
 - * fix npe when doing -Dcassandra.fd_initial_value_ms (CASSANDRA-6751)
 - * Preserves CQL metadata when updating table from thrift (CASSANDRA-6831)
  
 -
 -2.0.7
 +2.1.0-beta2
 + * Increase default CL space to 8GB (CASSANDRA-7031)
 + * Add range tombstones to read repair digests (CASSANDRA-6863)
 + * Fix BTree.clear for large updates (CASSANDRA-6943)
 + * Fail write instead of logging a warning when unable to append to CL
 +   (CASSANDRA-6764)
 + * Eliminate possibility of CL segment appearing twice in active list 
 +   (CASSANDRA-6557)
 + * Apply DONTNEED fadvise to commitlog segments (CASSANDRA-6759)
 + * Switch CRC component to Adler and include it for compressed sstables 
 +   (CASSANDRA-4165)
 + * Allow cassandra-stress to set compaction strategy options (CASSANDRA-6451)
 + * Add broadcast_rpc_address option to cassandra.yaml (CASSANDRA-5899)
 + * Auto reload GossipingPropertyFileSnitch config (CASSANDRA-5897)
 + * Fix overflow of memtable_total_space_in_mb (CASSANDRA-6573)
 + * Fix ABTC NPE and apply update function correctly (CASSANDRA-6692)
 + * Allow nodetool to use a file or prompt for password (CASSANDRA-6660)
 + * Fix AIOOBE when concurrently accessing ABSC (CASSANDRA-6742)
 + * Fix assertion error in ALTER TYPE RENAME (CASSANDRA-6705)
 + * Scrub should not always clear out repaired status (CASSANDRA-5351)
 + * Improve handling of range tombstone for wide partitions (CASSANDRA-6446)
 + * Fix ClassCastException for compact table with composites (CASSANDRA-6738)
 + * Fix potentially repairing with wrong nodes (CASSANDRA-6808)
 + * Change caching option syntax (CASSANDRA-6745)
 + * Fix stress to do proper counter reads (CASSANDRA-6835)
 + * Fix help message for stress counter_write (CASSANDRA-6824)
 + * Fix stress smart Thrift client to pick servers correctly (CASSANDRA-6848)
 + * Add logging levels (minimal, normal or verbose) to stress tool (CASSANDRA-6849)
 + * Fix race condition in Batch CLE (CASSANDRA-6860)
 + * Improve cleanup/scrub/upgradesstables failure handling (CASSANDRA-6774)
 + * ByteBuffer write() methods for serializing sstables (CASSANDRA-6781)
 + * Proper compare function for CollectionType (CASSANDRA-6783)
 + * Update native server to Netty 4 (CASSANDRA-6236)
 + * Fix off-by-one error in stress (CASSANDRA-6883)
 + * Make OpOrder AutoCloseable (CASSANDRA-6901)
 + * Remove sync repair JMX interface (CASSANDRA-6900)
 + * Add multiple memory allocation options for memtables (CASSANDRA-6689, 6694)
 + * Remove adjusted op rate from stress output (CASSANDRA-6921)
 + * Add optimized CF.hasColumns() implementations (CASSANDRA-6941)
 + * Serialize batchlog mutations with the version of the target node
 +   (CASSANDRA-6931)
 + * Optimize CounterColumn#reconcile() (CASSANDRA-6953)
 + * Properly remove 1.2 sstable support in 2.1 (CASSANDRA-6869)
 + * Lock counter cells, not partitions (CASSANDRA-6880)
 + * Track presence of legacy counter shards in sstables (CASSANDRA-6888)
 + * Ensure safe resource cleanup when replacing sstables (CASSANDRA-6912)
 + * Add failure handler to async callback (CASSANDRA-6747)
 + * Fix AE when closing SSTable without releasing reference (CASSANDRA-7000)
 + * Clean up IndexInfo on keyspace/table drops (CASSANDRA-6924)
 + * Only snapshot relative SSTables when sequential repair (CASSANDRA-7024)
 + * Require nodetool rebuild_index to specify index names (CASSANDRA-7038)
 + * fix cassandra stress errors on reads with native protocol (CASSANDRA-7033)
 + * Use OpOrder to guard sstable references for reads (CASSANDRA-6919)
 + * Preemptive opening of compaction result (CASSANDRA-6916)
 + * Multi-threaded scrub/cleanup/upgradesstables (CASSANDRA-5547)
 + * Optimize cellname comparison (CASSANDRA-6934)
 + * Native protocol v3 (CASSANDRA-6855)
 + * Optimize Cell liveness checks and clean up Cell (CASSANDRA-7119)
 + * Support consistent range movements (CASSANDRA-2434)
 +Merged from 2.0:
 + * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072)
 + * Set JMX RMI port to 7199 (CASSANDRA-7087)
 + * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939)
 + * Log a warning for large batches (CASSANDRA-6487)
   * Put nodes in hibernate when join_ring is false (CASSANDRA-6961)
+  * Continue assassinating even if the endpoint vanishes (CASSANDRA-6787)
+  * Non-droppable verbs shouldn't be dropped from OTC (CASSANDRA-6980)
+  * Shutdown batchlog executor in SS#drain() (CASSANDRA-7025)
+  * Schedule schema pulls on change (CASSANDRA-6971)
   * Avoid early loading of non-system keyspaces before compaction-leftovers 
     cleanup at startup (CASSANDRA-6913)
   * Restrict Windows to parallel repairs (CASSANDRA-6907)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d62a553/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index 5d59460,35e48d6..ff7b98d
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,52 -13,20 +13,64 @@@ restore snapshots created with the prev
  'sstableloader' tool. You can upgrade the file format of your snapshots
  using the provided 'sstableupgrade' tool.
  
 +2.1
 +===
 +
 +New features
 +------------
 +   - SSTable data directory name is slightly changed. Each directory will
 +     have hex string appended after CF name, e.g.
 +         ks/cf-5be396077b811e3a3ab9dc4b9ac088d/
 +     This hex string part represents unique ColumnFamily ID.
 +     Note that existing directories are used as is, so only newly created
 +     directories after upgrade have new directory name format.
 +   - Saved key cache files also have ColumnFamily ID in their file name.
 +   - It is now possible to do incremental repairs, sstables that have been
 +     repaired are marked with a timestamp and not included in the next
 +     repair session. Use nodetool repair -par -inc to use this feature.
 +     A tool to manually mark/unmark sstables as repaired is available in
 +     tools/bin/sstablerepairedset.
 +   - Bootstrapping now ensures that range movements are consistent,
 +     meaning the data for the new node is taken from the node that is no 
 +     longer a responsible for that range of keys.  
 +     If you want the old behavior (due to a lost node perhaps)
 +     you can set the following property (-Dconsistent.rangemovement=false)
 +
 +Upgrading
 +---------
 +   - Rolling upgrades from anything pre-2.0.7 is not supported. Furthermore
 +     pre-2.0 sstables are not supported. This means that before upgrading
 +     a node on 2.1, this node must be started on 2.0 and
 +     'nodetool upgdradesstables' must be run (and this even in the case
 +     of not-rolling upgrades).
 +   - For size-tiered compaction users, Cassandra now defaults to ignoring
 +     the coldest 5% of sstables.  This can be customized with the
 +     cold_reads_to_omit compaction option; 0.0 omits nothing (the old
 +     behavior) and 1.0 omits everything.
 +   - Multithreaded compaction has been removed.
 +   - Counters implementation has been changed, replaced by a safer one with
 +     less caveats, but different performance characteristics. You might have
 +     to change your data model to accomodate the new implementation.
 +     (See https://issues.apache.org/jira/browse/CASSANDRA-6504 and the dev
 +     blog post at http://www.datastax.com/dev/blog/<PLACEHOLDER> for details).
 +   - (per-table) index_interval parameter has been replaced with
 +     min_index_interval and max_index_interval paratemeters. index_interval
 +     has been deprecated.
 +   - support for supercolumns has been removed from json2sstable
 +
+ 2.0.8
+ =====
+ 
+ New features
+ ------------
+     - New snitches have been used for users of Google Compute Engine and of
+       Cloudstack.
+ 
+ Upgrading
+ ---------
+     - Nothing specific to this release, but please see 2.0.7 if you are upgrading
+       from a previous version.
  
 -
  2.0.7
  =====