Updated Branches: refs/heads/cassandra-1.2 27ccc433f -> 1423fb110 refs/heads/trunk 63cc6b0c7 -> d9f6cb8a6
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/d9f6cb8a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d9f6cb8a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d9f6cb8a Branch: refs/heads/trunk Commit: d9f6cb8a6f2582fb34f13f184cb86c7d9ff06768 Parents: 63cc6b0 1423fb1 Author: Jonathan Ellis <[email protected]> Authored: Fri Feb 8 10:57:00 2013 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Fri Feb 8 10:57:00 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 3 +- conf/cassandra-env.sh | 4 +++ .../org/apache/cassandra/transport/Server.java | 16 ++++++++++++++- 3 files changed, 21 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9f6cb8a/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9f6cb8a/conf/cassandra-env.sh ----------------------------------------------------------------------
