Revert "Revert "Fix build, bump version"" This reverts commit ce3d9af33102eb36dd03e04d022725a551d3c039.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f0be8904 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f0be8904 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f0be8904 Branch: refs/heads/trunk Commit: f0be8904dfc18b01e65a33945cd163df22190c69 Parents: 3c43775 Author: T Jake Luciani <[email protected]> Authored: Wed Jul 29 18:29:45 2015 -0400 Committer: T Jake Luciani <[email protected]> Committed: Wed Jul 29 18:29:45 2015 -0400 ---------------------------------------------------------------------- build.xml | 2 +- src/java/org/apache/cassandra/schema/SchemaKeyspace.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0be8904/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 5cd8f20..dc44f07 100644 --- a/build.xml +++ b/build.xml @@ -25,7 +25,7 @@ <property name="debuglevel" value="source,lines,vars"/> <!-- default version and SCM information --> - <property name="base.version" value="3.0.0"/> + <property name="base.version" value="3.0.0-alpha"/> <property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/> <property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/> <property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/> http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0be8904/src/java/org/apache/cassandra/schema/SchemaKeyspace.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java index 2150f4a..8dc25d4 100644 --- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java +++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java @@ -1340,7 +1340,7 @@ public final class SchemaKeyspace String name = row.getString("view_name"); List<String> partitionColumnNames = row.getList("target_columns", UTF8Type.instance); - String cfName = row.getString("columnfamily_name"); + String cfName = row.getString("table_name"); List<String> clusteringColumnNames = row.getList("clustering_columns", UTF8Type.instance); List<ColumnIdentifier> partitionColumns = new ArrayList<>();
