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/e9397731 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9397731 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9397731 Branch: refs/heads/trunk Commit: e93977310877595e50a8555a4a3322f29a3e3485 Parents: 13ec86c df65a6c Author: Sylvain Lebresne <[email protected]> Authored: Mon Aug 17 15:04:48 2015 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Mon Aug 17 15:04:48 2015 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/filter/ColumnSubselection.java | 3 ++- src/java/org/apache/cassandra/db/marshal/CollectionType.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
