Release 0.7~beta1, merge fixes from Paul Cannon

driftx · Aug 15, 2010 · 6f5dce7 · 6f5dce7
1 parent f2402a3
commit 6f5dce7
Show file tree

Hide file tree

Showing 6 changed files with 930 additions and 532 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,11 @@
+python-telephus (0.7~beta1) unstable; urgency=low
+
+  * Add describe_version
+  * Update to work with Cassandra 0.7.x HEAD r985573
+  * Merge updates from Paul Cannon
+
+ -- Brandon Williams <brandon@riptano.com>  Sun, 15 Aug 2010 08:40:00 +0000
+
 python-telephus (0.6.2) unstable; urgency=low
 
   * Fix double errbacks

diff --git a/telephus/cassandra/Cassandra-remote b/telephus/cassandra/Cassandra-remote
@@ -40,7 +40,7 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
   print '  string describe_version()'
   print '   describe_ring(string keyspace)'
   print '  string describe_partitioner()'
-  print '   describe_keyspace(string keyspace)'
+  print '  KsDef describe_keyspace(string keyspace)'
   print '   describe_splits(string keyspace, string cfName, string start_token, string end_token, i32 keys_per_split)'
   print '  string system_add_column_family(CfDef cf_def)'
   print '  string system_drop_column_family(string column_family)'