Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e90ec26b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e90ec26b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e90ec26b Branch: refs/heads/trunk Commit: e90ec26b67eeca60a70c4c91fdb37ea9d09b7660 Parents: 1944e40 d68325b Author: Benedict Elliott Smith <bened...@apache.org> Authored: Tue Sep 15 17:41:28 2015 +0100 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Tue Sep 15 17:41:28 2015 +0100 ---------------------------------------------------------------------- .../apache/cassandra/config/ColumnDefinition.java | 17 +++++++++++------ .../apache/cassandra/cql3/ColumnIdentifier.java | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
