Merge branch 'cassandra-2.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/769c9861 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/769c9861 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/769c9861 Branch: refs/heads/trunk Commit: 769c9861a0db58db94d7a597f1820c09e58a7112 Parents: bd92b0f ae8aad4 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Jun 12 09:47:08 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Jun 12 09:47:08 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra.yaml | 2 +- src/java/org/apache/cassandra/transport/Server.java | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/769c9861/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/769c9861/src/java/org/apache/cassandra/transport/Server.java ----------------------------------------------------------------------
