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/0d0aed85 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d0aed85 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0d0aed85 Branch: refs/heads/trunk Commit: 0d0aed85fe1b520f9390091b74e4e4d4a70b7425 Parents: 2a6e071 44a9d8c Author: Aleksey Yeschenko <[email protected]> Authored: Wed Aug 27 18:21:02 2014 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Wed Aug 27 18:21:02 2014 +0300 ---------------------------------------------------------------------- pylib/cqlshlib/helptopics.py | 2 +- src/java/org/apache/cassandra/cql3/Operation.java | 4 ++-- src/java/org/apache/cassandra/cql3/Sets.java | 2 +- test/unit/org/apache/cassandra/cql3/CollectionsTest.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d0aed85/pylib/cqlshlib/helptopics.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d0aed85/src/java/org/apache/cassandra/cql3/Sets.java ----------------------------------------------------------------------
