From 5b66997fa8be961dd17cdc93b29f2b61491f2cbb Mon Sep 17 00:00:00 2001
From: T Jake Luciani <jake@apache.org>
Date: Fri, 9 Jan 2015 15:21:49 -0500
Subject: [PATCH 1/3] prep for 2.0.12 release

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

diff --git a/NEWS.txt b/NEWS.txt
index 6f6b795458..2bc4fe6935 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
 ======
 
diff --git a/build.xml b/build.xml
index 8c23407f05..9bbb54f79a 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"/>
diff --git a/debian/changelog b/debian/changelog
index 39d9520ff3..9853818ec6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.0.12); urgency=medium
+
+  * New release 
+
+ -- Jake Luciani <jake@apache.org>  Fri, 09 Jan 2015 15:20:30 -0500
+
 cassandra (2.0.11) unstable; urgency=medium
 
   * New release

From df1f5ead0950d4d3058cf6fe0fcae9ef528014fa Mon Sep 17 00:00:00 2001
From: T Jake Luciani <jake@apache.org>
Date: Fri, 9 Jan 2015 15:48:48 -0500
Subject: [PATCH 2/3] fix debian changelog

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

diff --git a/debian/changelog b/debian/changelog
index 9853818ec6..53fa20fb1f 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 
 

From e4fc395242ee81a85141eda616ba97e937d1c604 Mon Sep 17 00:00:00 2001
From: Dave Brosius <dbrosius@mebigfatguy.com>
Date: Fri, 9 Jan 2015 19:50:54 -0500
Subject: [PATCH 3/3] fix hints serialized size calculation patch by dbrosius
 reviewed by thobbs for cassandra-8587

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

diff --git a/CHANGES.txt b/CHANGES.txt
index 0c7e9a2640..fc43dfa0eb 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:
diff --git a/src/java/org/apache/cassandra/net/MessageOut.java b/src/java/org/apache/cassandra/net/MessageOut.java
index dd6cae8e7c..f49e3f76b4 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;
         }