Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 bcc68fe4a -> b48d0da6d refs/heads/cassandra-2.1.0 29a993485 -> 0e393c935 refs/heads/trunk e90c493cb -> 89463a567
Fix typo in CFDefinition patch by slebresne; reviewed by iamaleksey for CASSANDRA-7452 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4c95d084 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4c95d084 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4c95d084 Branch: refs/heads/cassandra-2.1 Commit: 4c95d08480a88e31763da7926d379e9e4bc264a9 Parents: 3425200 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Jul 2 17:19:18 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Jul 2 17:19:18 2014 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cql3/CFDefinition.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c95d084/src/java/org/apache/cassandra/cql3/CFDefinition.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/CFDefinition.java b/src/java/org/apache/cassandra/cql3/CFDefinition.java index 3266c95..23bedaf 100644 --- a/src/java/org/apache/cassandra/cql3/CFDefinition.java +++ b/src/java/org/apache/cassandra/cql3/CFDefinition.java @@ -152,7 +152,7 @@ public class CFDefinition implements Iterable<CFDefinition.Name> public Collection<Name> staticColumns() { - return regularColumns.values(); + return staticColumns.values(); } public Name compactValue()
