You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2015/07/29 22:54:00 UTC
cassandra git commit: Fix build, bump version
Repository: cassandra
Updated Branches:
refs/heads/trunk 3bdcaa336 -> b93f05d7d
Fix build, bump version
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b93f05d7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b93f05d7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b93f05d7
Branch: refs/heads/trunk
Commit: b93f05d7d1490c6146576a35f5a572d9d0e72399
Parents: 3bdcaa3
Author: T Jake Luciani <ja...@apache.org>
Authored: Wed Jul 29 16:53:43 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Wed Jul 29 16:53:43 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/b93f05d7/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/b93f05d7/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<>();