Repository: cassandra Updated Branches: refs/heads/trunk 4635f2f95 -> 24d185d72
Revert "Fix build, bump version" This reverts commit b93f05d7d1490c6146576a35f5a572d9d0e72399. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ce3d9af3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ce3d9af3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ce3d9af3 Branch: refs/heads/trunk Commit: ce3d9af33102eb36dd03e04d022725a551d3c039 Parents: 4635f2f Author: Jonathan Ellis <[email protected]> Authored: Wed Jul 29 17:03:46 2015 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Jul 29 17:03:46 2015 -0500 ---------------------------------------------------------------------- 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/ce3d9af3/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index dc44f07..5cd8f20 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-alpha"/> + <property name="base.version" value="3.0.0"/> <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/ce3d9af3/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 8dc25d4..2150f4a 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("table_name"); + String cfName = row.getString("columnfamily_name"); List<String> clusteringColumnNames = row.getList("clustering_columns", UTF8Type.instance); List<ColumnIdentifier> partitionColumns = new ArrayList<>();
