merge from 0.6

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@988374 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2010-08-24 02:10:54 +00:00
parent 312aaf0f56
commit e8b310655d
2 changed files with 2 additions and 3 deletions

View File

@ -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

2
debian/rules vendored
View File

@ -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