You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by ja...@apache.org on 2013/08/13 18:53:59 UTC

[2/2] git commit: Merge branch 'cassandra-2.0' into trunk

Merge branch 'cassandra-2.0' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/129d50db
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/129d50db
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/129d50db

Branch: refs/heads/trunk
Commit: 129d50dbe62dbfc0ae2425faaafd73a236d56ca8
Parents: c6bf9dc 89fc576
Author: Jake Luciani <ja...@apache.org>
Authored: Tue Aug 13 12:53:37 2013 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Tue Aug 13 12:53:37 2013 -0400

----------------------------------------------------------------------
 CHANGES.txt                                       | 1 +
 src/java/org/apache/cassandra/io/util/Memory.java | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------