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/c2008514 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2008514 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2008514 Branch: refs/heads/trunk Commit: c20085143ddd2cef68b0a0c918a7d377b1b3dab4 Parents: 6d22f6d 1fc8899 Author: T Jake Luciani <j...@apache.org> Authored: Tue Sep 9 15:39:29 2014 -0700 Committer: T Jake Luciani <j...@apache.org> Committed: Tue Sep 9 15:39:29 2014 -0700 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/AbstractNativeCell.java | 2 +- .../org/apache/cassandra/db/ArrayBackedSortedColumns.java | 1 - src/java/org/apache/cassandra/db/CollationController.java | 1 - src/java/org/apache/cassandra/db/ConsistencyLevel.java | 1 - src/java/org/apache/cassandra/service/StorageProxy.java | 2 -- src/java/org/apache/cassandra/utils/FastByteOperations.java | 9 --------- src/java/org/apache/cassandra/utils/MurmurHash.java | 1 - 7 files changed, 1 insertion(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2008514/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2008514/src/java/org/apache/cassandra/db/CollationController.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2008514/src/java/org/apache/cassandra/db/ConsistencyLevel.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2008514/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
