Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/34112efa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/34112efa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/34112efa Branch: refs/heads/trunk Commit: 34112efa4b23db02c8c99f5bce02afbb1f98c64b Parents: 723fcd1 ed5cac1 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Feb 4 18:33:33 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Feb 4 18:33:33 2014 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------
