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/ac8d3c17 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac8d3c17 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac8d3c17 Branch: refs/heads/trunk Commit: ac8d3c174be78931d5d00c6e242eeaccc1677d47 Parents: 616c019 371507a Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Tue Jun 3 00:01:39 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Tue Jun 3 00:01:39 2014 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/utils/btree/UpdateFunction.java | 4 ++++ 1 file changed, 4 insertions(+) ----------------------------------------------------------------------
