merge w/ 0.6 branch

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@943715 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eric Evans 2010-05-12 22:10:45 +00:00
parent d087f862ef
commit aa5911bc4d
2 changed files with 4 additions and 0 deletions

View File

@ -40,6 +40,7 @@ dev
* fix tombstone handling in sstable rows with no other data (CASSANDRA-1063)
* fix size of row in spanned index entries (CASSANDRA-1056)
* indicate stream sources/destinations prior to anticompaction (CASSANDRA-956)
* install json2sstable, sstable2json, and sstablekeys to Debian package
0.6.1

View File

@ -5,5 +5,8 @@ bin/cassandra usr/sbin
bin/cassandra-cli usr/bin
bin/nodetool usr/bin
bin/clustertool usr/bin
bin/json2sstable usr/bin
bin/sstable2json usr/bin
bin/sstablekeys usr/bin
lib/*.jar usr/share/cassandra
lib/licenses usr/share/doc/cassandra