Updated Branches: refs/heads/cassandra-1.2 a5e70594b -> 2721958a4 refs/heads/cassandra-1.2.0 2f187c920 -> 188f07928 refs/heads/trunk ec53d61cd -> e74c11dc0
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/e74c11dc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e74c11dc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e74c11dc Branch: refs/heads/trunk Commit: e74c11dc0bac45f78e6bc263cb65f3232284d87b Parents: ec53d61 2721958 Author: Jonathan Ellis <[email protected]> Authored: Sat Dec 1 04:07:40 2012 +0900 Committer: Jonathan Ellis <[email protected]> Committed: Sat Dec 1 04:07:40 2012 +0900 ---------------------------------------------------------------------- build.xml | 2 +- debian/changelog | 6 ++++++ src/java/org/apache/cassandra/tools/NodeProbe.java | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
