Merge commit 'e20c7eea498263f92267f4cbc39ad9372006ff6c' from release-0.9.4-pre-rc
Change-Id: I32462904d0c876b627412a20bd65d2190544a016 Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/55719347 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/55719347 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/55719347 Branch: refs/heads/master Commit: 5571934773e1d05fb0ed0e8419f236b411a5f559 Parents: b001400 e20c7ee Author: Michael Blow <mb...@apache.org> Authored: Tue Apr 10 12:11:16 2018 -0400 Committer: Michael Blow <mb...@apache.org> Committed: Tue Apr 10 12:11:16 2018 -0400 ---------------------------------------------------------------------- asterixdb/asterix-external-data/pom.xml | 19 ------ .../operators/FeedMetaStoreNodePushable.java | 3 +- .../LSMPrimaryUpsertOperatorNodePushable.java | 42 ++++++++++++- asterixdb/pom.xml | 8 +++ .../apache/hyracks/control/nc/CcConnection.java | 5 +- .../control/nc/NodeControllerService.java | 3 +- .../hyracks/http/api/IServletResponse.java | 8 ++- .../http/server/ChunkedNettyOutputStream.java | 10 +-- .../hyracks/http/server/ChunkedResponse.java | 5 ++ .../hyracks/http/server/FullResponse.java | 6 ++ .../hyracks/http/server/HttpRequestHandler.java | 4 ++ .../hyracks/http/server/HttpServerHandler.java | 30 ++++++--- .../hyracks/maven/license/GenerateFileMojo.java | 2 +- .../hyracks/maven/license/LicenseUtil.java | 16 +++-- .../license/freemarker/IndentDirective.java | 12 +++- .../impls/AbstractLSMIndexOperationContext.java | 5 +- .../am/lsm/common/impls/TracedIOOperation.java | 18 +++--- .../hyracks/test/support/LicensingTestBase.java | 8 ++- .../org/apache/hyracks/util/ThreadDumpUtil.java | 64 +++++++++++++++++++- .../util/trace/ITraceCategoryRegistry.java | 21 ++++--- .../util/trace/TraceCategoryRegistry.java | 46 ++++++++------ .../apache/hyracks/util/trace/TraceUtils.java | 35 +++++++++++ .../org/apache/hyracks/util/trace/Tracer.java | 14 ++++- 23 files changed, 287 insertions(+), 97 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/55719347/asterixdb/asterix-external-data/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/55719347/asterixdb/pom.xml ----------------------------------------------------------------------
