You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/05/22 02:53:03 UTC
[1/2] git commit: spilleng
Updated Branches:
refs/heads/trunk f3d2a52b9 -> bac41da61
spilleng
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/de2ee6e2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de2ee6e2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de2ee6e2
Branch: refs/heads/trunk
Commit: de2ee6e28fc65340c1702583fef343d7d81bbc3b
Parents: 687ac71
Author: Dave Brosius <db...@apache.org>
Authored: Tue May 21 20:49:20 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Tue May 21 20:49:20 2013 -0400
----------------------------------------------------------------------
.../org/apache/cassandra/tools/SSTableExport.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/de2ee6e2/src/java/org/apache/cassandra/tools/SSTableExport.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/SSTableExport.java b/src/java/org/apache/cassandra/tools/SSTableExport.java
index 90274d1..1d898ef 100644
--- a/src/java/org/apache/cassandra/tools/SSTableExport.java
+++ b/src/java/org/apache/cassandra/tools/SSTableExport.java
@@ -505,7 +505,7 @@ public class SSTableExport
Descriptor descriptor = Descriptor.fromFilename(ssTableFileName);
if (Schema.instance.getCFMetaData(descriptor) == null)
{
- System.err.println(String.format("The provided column family is not part of this cassandra database: keysapce = %s, column family = %s",
+ System.err.println(String.format("The provided column family is not part of this cassandra database: keyspace = %s, column family = %s",
descriptor.ksname, descriptor.cfname));
System.exit(1);
}
[2/2] git commit: Merge branch 'cassandra-1.2' into trunk
Posted by db...@apache.org.
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bac41da6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bac41da6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bac41da6
Branch: refs/heads/trunk
Commit: bac41da6118518a99161979d035d8a8f3cde585f
Parents: f3d2a52 de2ee6e
Author: Dave Brosius <db...@apache.org>
Authored: Tue May 21 20:52:35 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Tue May 21 20:52:35 2013 -0400
----------------------------------------------------------------------
.../org/apache/cassandra/tools/SSTableExport.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bac41da6/src/java/org/apache/cassandra/tools/SSTableExport.java
----------------------------------------------------------------------