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/c06ba25a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c06ba25a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c06ba25a Branch: refs/heads/trunk Commit: c06ba25a51256324c68e958fec3298fc2f58983b Parents: d30b745 6b5b7f5 Author: Dave Brosius <[email protected]> Authored: Tue Apr 29 23:05:35 2014 -0400 Committer: Dave Brosius <[email protected]> Committed: Tue Apr 29 23:05:35 2014 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/NativeCounterCell.java | 2 +- src/java/org/apache/cassandra/db/NativeExpiringCell.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
