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/3d017f08 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d017f08 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d017f08 Branch: refs/heads/trunk Commit: 3d017f08ffec767bfc3b41a060a7e49706f2f6d7 Parents: 976f401 60882c1 Author: Jonathan Ellis <[email protected]> Authored: Mon Mar 17 10:51:43 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon Mar 17 10:51:43 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../thrift/CustomTThreadPoolServer.java | 25 ++++++++++---------- 2 files changed, 14 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d017f08/CHANGES.txt ----------------------------------------------------------------------
