You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2014/05/19 12:33:16 UTC
[1/2] git commit: Changelog fix
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 590b3b23a -> 66a3da0e2
Changelog fix
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/86632a13
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/86632a13
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/86632a13
Branch: refs/heads/cassandra-2.1
Commit: 86632a1339f9539c30504a90d133b94364708a40
Parents: 9d06ea6
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon May 19 12:32:15 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon May 19 12:32:15 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 36 +++++++++++++++++-------------------
1 file changed, 17 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/86632a13/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4f84af1..5c9b436 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,22 +1,3 @@
-2.0.9
- * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221)
- * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228)
- * Fix potential SlabAllocator yield-starvation (CASSANDRA-7133)
- * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067)
- * Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177)
- * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183)
- * fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162)
- * Fix disabling autocompaction (CASSANDRA-7187)
- * Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088)
- * cqlsh can't tab-complete disabling compaction (CASSANDRA-7185)
- * cqlsh: Accept and execute CQL statement(s) from command-line parameter (CASSANDRA-7172)
- * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198)
- * Fix the InvertedIndex trigger example (CASSANDRA-7211)
- * Add --resolve-ip option to 'nodetool ring' (CASSANDRA-7210)
- * Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818)
- * reduce garbage on codec flag deserialization (CASSANDRA-7244)
-
-
2.0.8
* Correctly delete scheduled range xfers (CASSANDRA-7143)
* Make batchlog replica selection rack-aware (CASSANDRA-6551)
@@ -33,6 +14,23 @@
* 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)
+ * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221)
+ * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228)
+ * Fix potential SlabAllocator yield-starvation (CASSANDRA-7133)
+ * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067)
+ * Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177)
+ * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183)
+ * fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162)
+ * Fix disabling autocompaction (CASSANDRA-7187)
+ * Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088)
+ * cqlsh can't tab-complete disabling compaction (CASSANDRA-7185)
+ * cqlsh: Accept and execute CQL statement(s) from command-line parameter (CASSANDRA-7172)
+ * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198)
+ * Fix the InvertedIndex trigger example (CASSANDRA-7211)
+ * Add --resolve-ip option to 'nodetool ring' (CASSANDRA-7210)
+ * Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818)
+ * reduce garbage on codec flag deserialization (CASSANDRA-7244)
+ * Proper null handle for IF with map element access (CASSANDRA-7155)
Merged from 1.2:
* Add Cloudstack snitch (CASSANDRA-7147)
* Update system.peers correctly when relocating tokens (CASSANDRA-7126)
[2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by sl...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66a3da0e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66a3da0e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66a3da0e
Branch: refs/heads/cassandra-2.1
Commit: 66a3da0e2fed7fd87f3af7bf73d821bcc21fad7a
Parents: 590b3b2 86632a1
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon May 19 12:33:06 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon May 19 12:33:06 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/66a3da0e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4efaa46,5c9b436..eda9fd8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -35,7 -28,9 +35,9 @@@ Merged from 2.0
* Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198)
* Fix the InvertedIndex trigger example (CASSANDRA-7211)
* Add --resolve-ip option to 'nodetool ring' (CASSANDRA-7210)
- * Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818)
* reduce garbage on codec flag deserialization (CASSANDRA-7244)
++ * Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818)
+ * Proper null handle for IF with map element access (CASSANDRA-7155)
Merged from 1.2:
* Add Cloudstack snitch (CASSANDRA-7147)
* Update system.peers correctly when relocating tokens (CASSANDRA-7126)