From aa5911bc4dc542df273e76e8a8fb579072104617 Mon Sep 17 00:00:00 2001 From: Eric Evans Date: Wed, 12 May 2010 22:10:45 +0000 Subject: [PATCH] merge w/ 0.6 branch git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@943715 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 1 + debian/cassandra.install | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index 42de09d1c8..7ebd862cbb 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -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 diff --git a/debian/cassandra.install b/debian/cassandra.install index 3caf2e1f54..ab4ec4f429 100644 --- a/debian/cassandra.install +++ b/debian/cassandra.install @@ -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