You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2015/01/10 01:59:55 UTC

[1/6] cassandra git commit: prep for 2.0.12 release

Repository: cassandra
Updated Branches:
  refs/heads/trunk c6525da86 -> fa0cc9039


prep for 2.0.12 release


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

Branch: refs/heads/trunk
Commit: 5b66997fa8be961dd17cdc93b29f2b61491f2cbb
Parents: dd62f7b
Author: T Jake Luciani <ja...@apache.org>
Authored: Fri Jan 9 15:21:49 2015 -0500
Committer: T Jake Luciani <ja...@apache.org>
Committed: Fri Jan 9 15:21:49 2015 -0500

----------------------------------------------------------------------
 NEWS.txt         | 9 +++++++++
 build.xml        | 2 +-
 debian/changelog | 6 ++++++
 3 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b66997f/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 6f6b795..2bc4fe6 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -13,6 +13,15 @@ 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.12
+======
+
+Upgrading
+---------
+    - Nothing specific to this release, but refer to previous entries if you
+      are upgrading from a previous version.
+
+
 2.0.11
 ======
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b66997f/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 8c23407..9bbb54f 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.11"/>
+    <property name="base.version" value="2.0.12"/>
     <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/5b66997f/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 39d9520..9853818 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.0.12); urgency=medium
+
+  * New release 
+
+ -- Jake Luciani <ja...@apache.org>  Fri, 09 Jan 2015 15:20:30 -0500
+
 cassandra (2.0.11) unstable; urgency=medium
 
   * New release

[3/6] cassandra git commit: fix debian changelog

Posted by db...@apache.org.
fix debian changelog


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

Branch: refs/heads/trunk
Commit: df1f5ead0950d4d3058cf6fe0fcae9ef528014fa
Parents: 5b66997
Author: T Jake Luciani <ja...@apache.org>
Authored: Fri Jan 9 15:48:48 2015 -0500
Committer: T Jake Luciani <ja...@apache.org>
Committed: Fri Jan 9 15:48:48 2015 -0500

----------------------------------------------------------------------
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/df1f5ead/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 9853818..53fa20f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-cassandra (2.0.12); urgency=medium
+cassandra (2.0.12) unstable; urgency=medium
 
   * New release

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

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


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

Branch: refs/heads/trunk
Commit: e9061922da418930dd1d607da7f2499dc067bac2
Parents: 49d5c8d e4fc395
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Fri Jan 9 19:58:44 2015 -0500
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Fri Jan 9 19:58:44 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                                       | 2 +-
 src/java/org/apache/cassandra/net/MessageOut.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9061922/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index abe3fce,fc43dfa..55ca55d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -96,36 -44,7 +96,36 @@@ Merged from 2.0
   * Avoid overlap in L1 when L0 contains many nonoverlapping
     sstables (CASSANDRA-8211)
   * Improve PropertyFileSnitch logging (CASSANDRA-8183)
 - * Abort liveRatio calculation if the memtable is flushed (CASSANDRA-8164)
 + * Add DC-aware sequential repair (CASSANDRA-8193)
 + * Use live sstables in snapshot repair if possible (CASSANDRA-8312)
- 
++ * Fix hints serialized size calculation (CASSANDRA-8587)
 +
 +2.1.2
 + * (cqlsh) parse_for_table_meta errors out on queries with undefined
 +   grammars (CASSANDRA-8262)
 + * (cqlsh) Fix SELECT ... TOKEN() function broken in C* 2.1.1 (CASSANDRA-8258)
 + * Fix Cassandra crash when running on JDK8 update 40 (CASSANDRA-8209)
 + * Optimize partitioner tokens (CASSANDRA-8230)
 + * Improve compaction of repaired/unrepaired sstables (CASSANDRA-8004)
 + * Make cache serializers pluggable (CASSANDRA-8096)
 + * Fix issues with CONTAINS (KEY) queries on secondary indexes
 +   (CASSANDRA-8147)
 + * Fix read-rate tracking of sstables for some queries (CASSANDRA-8239)
 + * Fix default timestamp in QueryOptions (CASSANDRA-8246)
 + * Set socket timeout when reading remote version (CASSANDRA-8188)
 + * Refactor how we track live size (CASSANDRA-7852)
 + * Make sure unfinished compaction files are removed (CASSANDRA-8124)
 + * Fix shutdown when run as Windows service (CASSANDRA-8136)
 + * Fix DESCRIBE TABLE with custom indexes (CASSANDRA-8031)
 + * Fix race in RecoveryManagerTest (CASSANDRA-8176)
 + * Avoid IllegalArgumentException while sorting sstables in
 +   IndexSummaryManager (CASSANDRA-8182)
 + * Shutdown JVM on file descriptor exhaustion (CASSANDRA-7579)
 + * Add 'die' policy for commit log and disk failure (CASSANDRA-7927)
 + * Fix installing as service on Windows (CASSANDRA-8115)
 + * Fix CREATE TABLE for CQL2 (CASSANDRA-8144)
 + * Avoid boxing in ColumnStats min/max trackers (CASSANDRA-8109)
 +Merged from 2.0:
   * Correctly handle non-text column names in cql3 (CASSANDRA-8178)
   * Fix deletion for indexes on primary key columns (CASSANDRA-8206)
   * Add 'nodetool statusgossip' (CASSANDRA-8125)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9061922/src/java/org/apache/cassandra/net/MessageOut.java
----------------------------------------------------------------------

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

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


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

Branch: refs/heads/trunk
Commit: 49d5c8d979f70be3bfe70625e82efac31d4f58c4
Parents: 7f62e29 5b66997
Author: T Jake Luciani <ja...@apache.org>
Authored: Fri Jan 9 15:23:25 2015 -0500
Committer: T Jake Luciani <ja...@apache.org>
Committed: Fri Jan 9 15:23:25 2015 -0500

----------------------------------------------------------------------

----------------------------------------------------------------------

[4/6] cassandra git commit: fix hints serialized size calculation patch by dbrosius reviewed by thobbs for cassandra-8587

Posted by db...@apache.org.
fix hints serialized size calculation
patch by dbrosius reviewed by thobbs for cassandra-8587


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

Branch: refs/heads/trunk
Commit: e4fc395242ee81a85141eda616ba97e937d1c604
Parents: df1f5ea
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Fri Jan 9 19:50:54 2015 -0500
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Fri Jan 9 19:50:54 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                                       | 1 +
 src/java/org/apache/cassandra/net/MessageOut.java | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4fc3952/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0c7e9a2..fc43dfa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -59,6 +59,7 @@
  * Add DC-aware sequential repair (CASSANDRA-8193)
  * Improve JBOD disk utilization (CASSANDRA-7386)
  * Use live sstables in snapshot repair if possible (CASSANDRA-8312)
+ * Fix hints serialized size calculation (CASSANDRA-8587)
 
 
 2.0.11:

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4fc3952/src/java/org/apache/cassandra/net/MessageOut.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/MessageOut.java b/src/java/org/apache/cassandra/net/MessageOut.java
index dd6cae8..f49e3f7 100644
--- a/src/java/org/apache/cassandra/net/MessageOut.java
+++ b/src/java/org/apache/cassandra/net/MessageOut.java
@@ -128,8 +128,8 @@ public class MessageOut<T>
         size += TypeSizes.NATIVE.sizeof(parameters.size());
         for (Map.Entry<String, byte[]> entry : parameters.entrySet())
         {
-            TypeSizes.NATIVE.sizeof(entry.getKey());
-            TypeSizes.NATIVE.sizeof(entry.getValue().length);
+            size += TypeSizes.NATIVE.sizeof(entry.getKey());
+            size += TypeSizes.NATIVE.sizeof(entry.getValue().length);
             size += entry.getValue().length;
         }

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

Posted by db...@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/fa0cc903
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fa0cc903
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fa0cc903

Branch: refs/heads/trunk
Commit: fa0cc90393d079aee40e91d02846f915093efe13
Parents: c6525da e906192
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Fri Jan 9 19:59:14 2015 -0500
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Fri Jan 9 19:59:14 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                                       | 2 +-
 src/java/org/apache/cassandra/net/MessageOut.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa0cc903/src/java/org/apache/cassandra/net/MessageOut.java
----------------------------------------------------------------------