Merge branch 'cassandra-1.2' into trunk
Conflicts:
src/java/org/apache/cassandra/thrift/CustomTHsHaServer.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/377da747
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/377da747
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/377da747
Branch: refs/heads/trunk
Commit: 377da747b7907b6be78dfecffef22a3eab9b2f6c
Parents: 8e003d8 cc9ac82
Author: Jason Brown <jasedbr...@gmail.com>
Authored: Fri Jul 5 22:02:59 2013 -0700
Committer: Jason Brown <jasedbr...@gmail.com>
Committed: Fri Jul 5 22:02:59 2013 -0700
----------------------------------------------------------------------
CHANGES.txt | 2 +-
.../cassandra/thrift/TCustomNonblockingServerSocket.java | 2 --
src/java/org/apache/cassandra/thrift/ThriftSessionManager.java | 6 ++++++
3 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/377da747/CHANGES.txt
----------------------------------------------------------------------
