Updated Branches: refs/heads/cassandra-1.1 3034eeecb -> bf1ed4089 refs/heads/cassandra-1.2 9852a9360 -> af8a477cc refs/heads/trunk d495727d9 -> f6df04dbd
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6df04db Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6df04db Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f6df04db Branch: refs/heads/trunk Commit: f6df04dbd639af4bf18760f56570a5a20b779f0f Parents: d495727 af8a477 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Jan 4 12:14:26 2013 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Jan 4 12:14:26 2013 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------