Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8c1fc413 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8c1fc413 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8c1fc413 Branch: refs/heads/trunk Commit: 8c1fc4130515fe3539bafd1e453b34c1ea303141 Parents: fdf293d 86e3012 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Aug 26 17:27:01 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Aug 26 17:27:01 2014 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cql3/Lists.java | 6 +++--- src/java/org/apache/cassandra/cql3/Maps.java | 8 +++---- .../org/apache/cassandra/cql3/Operation.java | 22 ++++++++++---------- src/java/org/apache/cassandra/cql3/Sets.java | 8 +++---- 4 files changed, 22 insertions(+), 22 deletions(-) ----------------------------------------------------------------------
