Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/47da48b6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/47da48b6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/47da48b6 Branch: refs/heads/trunk Commit: 47da48b6f8e15ecb33ff8036a150eb0a2b967ca4 Parents: 22c0de6 65c695c Author: Sam Tunnicliffe <[email protected]> Authored: Fri Aug 7 16:13:11 2015 +0100 Committer: Sam Tunnicliffe <[email protected]> Committed: Fri Aug 7 16:13:11 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../JMXEnabledScheduledThreadPoolExecutor.java | 137 ------------------- ...EnabledScheduledThreadPoolExecutorMBean.java | 26 ---- .../JMXEnabledThreadPoolExecutor.java | 5 + .../cql3/functions/JavaBasedUDFunction.java | 21 ++- .../cql3/functions/ScriptBasedUDFunction.java | 17 +-- .../cassandra/db/HintedHandOffManager.java | 26 +++- 7 files changed, 41 insertions(+), 192 deletions(-) ----------------------------------------------------------------------
