Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e8766e53 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e8766e53 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e8766e53 Branch: refs/heads/cassandra-2.2 Commit: e8766e53d11645b41e25d904d5bdbdb2b1c0c9a9 Parents: ff1a156 7af9c6a Author: T Jake Luciani <j...@apache.org> Authored: Tue May 19 10:13:14 2015 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Tue May 19 10:13:14 2015 -0400 ---------------------------------------------------------------------- .../DebuggableScheduledThreadPoolExecutor.java | 9 ++ ...buggableScheduledThreadPoolExecutorTest.java | 115 +++++++++++++++++++ 2 files changed, 124 insertions(+) ----------------------------------------------------------------------
