Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5090afc7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5090afc7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5090afc7 Branch: refs/heads/trunk Commit: 5090afc7a8f7c49532ff441217614e808876be19 Parents: 3f05312 93f6529 Author: Carl Yeksigian <c...@apache.org> Authored: Wed Jan 13 14:47:41 2016 -0500 Committer: Carl Yeksigian <c...@apache.org> Committed: Wed Jan 13 14:47:41 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../AbstractLocalAwareExecutorService.java | 230 +++++++++++++++++++ .../AbstractTracingAwareExecutorService.java | 230 ------------------- .../DebuggableThreadPoolExecutor.java | 48 ++-- .../cassandra/concurrent/ExecutorLocal.java | 44 ++++ .../cassandra/concurrent/ExecutorLocals.java | 84 +++++++ .../concurrent/LocalAwareExecutorService.java | 34 +++ .../cassandra/concurrent/SEPExecutor.java | 3 +- .../concurrent/SharedExecutorPool.java | 2 +- .../cassandra/concurrent/StageManager.java | 12 +- .../concurrent/TracingAwareExecutorService.java | 36 --- .../cassandra/cql3/functions/UDFunction.java | 2 +- .../cql3/statements/BatchStatement.java | 9 +- .../cql3/statements/CreateViewStatement.java | 2 +- .../cql3/statements/SelectStatement.java | 4 +- .../org/apache/cassandra/db/ReadCommand.java | 2 +- .../apache/cassandra/net/MessagingService.java | 7 +- .../apache/cassandra/service/ClientWarn.java | 62 +++-- .../apache/cassandra/service/StorageProxy.java | 2 +- .../org/apache/cassandra/tracing/Tracing.java | 3 +- .../org/apache/cassandra/transport/Message.java | 6 +- .../transport/RequestThreadPoolExecutor.java | 4 +- .../cql3/validation/entities/UFTest.java | 6 +- .../cassandra/service/ClientWarningsTest.java | 58 +++++ 24 files changed, 545 insertions(+), 346 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5090afc7/CHANGES.txt ----------------------------------------------------------------------