Updated Branches: refs/heads/cassandra-1.1 374fa2c2f -> 47783861a refs/heads/trunk c3e6a1c31 -> 347b5775e
Merge branch 'cassandra-1.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/347b5775 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/347b5775 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/347b5775 Branch: refs/heads/trunk Commit: 347b5775e3ff05c693f5f07f2d3af01946e95c1e Parents: c3e6a1c 4778386 Author: Jonathan Ellis <[email protected]> Authored: Fri May 11 17:51:41 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri May 11 17:51:41 2012 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/utils/CLibrary.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/347b5775/src/java/org/apache/cassandra/utils/CLibrary.java ----------------------------------------------------------------------
