From e8b310655d692ba0e32d573a95f75b1ecfd0b565 Mon Sep 17 00:00:00 2001
From: Jonathan Ellis <jbellis@apache.org>
Date: Tue, 24 Aug 2010 02:10:54 +0000
Subject: [PATCH] merge from 0.6

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@988374 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt  | 3 +--
 debian/rules | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 08e3bfe083..d7e92ec542 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -90,8 +90,7 @@ dev
  * remove String.trim() call on row keys in batch mutations (CASSANDRA-1235)
  * Log summary of dropped messages instead of spamming log (CASSANDRA-1284)
  * add dynamic endpoint snitch (CASSANDRA-981)
- * Use a regex to filter keyspace and column family names during
-   initialization (CASSANDRA-1377)
+ * fix streaming for keyspaces with hyphens in their name (CASSANDRA-1377)
  * fix errors in hard-coded bloom filter optKPerBucket by computing it
    algorithmically (CASSANDRA-1220
  * remove message deserialization stage, and uncap read/write stages
diff --git a/debian/rules b/debian/rules
index 9216e4b2f2..da4cd705b0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 #export DH_VERBOSE=1
 
 ANT = /usr/bin/ant
-VERSION = $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')
+VERSION = $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)/\1/p')
 
 test:
 	dh_testdir