Updated Branches: refs/heads/cassandra-1.0 142e8c1a2 -> c73881309 refs/heads/cassandra-1.1 389e6cd72 -> f57f1c07c refs/heads/cassandra-1.1.0 2eaea5be9 -> 483a69992 refs/heads/trunk 0501cdd39 -> 2914f15a0
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2914f15a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2914f15a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2914f15a Branch: refs/heads/trunk Commit: 2914f15a007f8b7c0994fc61c97161dd32f9bbe6 Parents: 0501cdd f57f1c0 Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Apr 13 10:35:42 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Apr 13 10:35:42 2012 -0500 ---------------------------------------------------------------------- .rat-excludes | 1 + CHANGES.txt | 8 +------- build.xml | 2 +- debian/changelog | 6 ++++++ .../cassandra/locator/PropertyFileSnitch.java | 3 ++- 5 files changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2914f15a/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2914f15a/build.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2914f15a/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java ----------------------------------------------------------------------
