Updated Branches: refs/heads/cassandra-1.1 be0119778 -> a7da0295d refs/heads/cassandra-1.2 17adf8e4f -> a330716d4 refs/heads/trunk 262fadb27 -> 0d5738f1f
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/0d5738f1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d5738f1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0d5738f1 Branch: refs/heads/trunk Commit: 0d5738f1f30feb34c0465d8a662026b6776048d6 Parents: 262fadb a330716 Author: Jonathan Ellis <[email protected]> Authored: Fri Jan 18 12:58:26 2013 -0800 Committer: Jonathan Ellis <[email protected]> Committed: Fri Jan 18 12:58:26 2013 -0800 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../apache/cassandra/service/LoadBroadcaster.java | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d5738f1/CHANGES.txt ----------------------------------------------------------------------
