Updated Branches: refs/heads/cassandra-1.2 7ff2805c7 -> bc428351e refs/heads/trunk 0411d5a2b -> 8caedfc2c
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/8caedfc2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8caedfc2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8caedfc2 Branch: refs/heads/trunk Commit: 8caedfc2c02fe587aff94f73b5b5bf0f621a9884 Parents: 0411d5a bc42835 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Feb 14 11:56:47 2013 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Feb 14 11:56:47 2013 -0600 ---------------------------------------------------------------------- .../locator/DynamicEndpointSnitchMBean.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ----------------------------------------------------------------------