Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b9e42dfa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b9e42dfa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b9e42dfa Branch: refs/heads/trunk Commit: b9e42dfa8b3642bef2bdfec952c56a806dba7910 Parents: 8462335 a15e11a Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Aug 26 10:40:28 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Aug 26 10:40:28 2014 -0500 ---------------------------------------------------------------------- debian/init | 2 ++ 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 +++---- 5 files changed, 24 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9e42dfa/src/java/org/apache/cassandra/cql3/Lists.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9e42dfa/src/java/org/apache/cassandra/cql3/Maps.java ----------------------------------------------------------------------