You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2018/03/23 15:10:06 UTC
[4/4] asterixdb git commit: Merge commit
'94b6da6ae33749dfdee35e35f32c165693015e3d' from release-0.9.4-pre-rc
Merge commit '94b6da6ae33749dfdee35e35f32c165693015e3d' from release-0.9.4-pre-rc
Change-Id: I73edc93888a80687416cc80014ffebc2683c68f6
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/ce675542
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/ce675542
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/ce675542
Branch: refs/heads/master
Commit: ce67554220164a9aab55bc1498d3b0559c498217
Parents: 2ebd0d4 94b6da6
Author: Michael Blow <mb...@apache.org>
Authored: Fri Mar 23 01:21:04 2018 -0400
Committer: Michael Blow <mb...@apache.org>
Committed: Fri Mar 23 01:21:04 2018 -0400
----------------------------------------------------------------------
.../hyracks/bootstrap/NCApplication.java | 1 +
.../asterix/test/common/TestExecutor.java | 14 +-
.../hyracks/control/cc/cluster/NodeManager.java | 15 +--
.../control/nc/NodeControllerService.java | 19 +--
.../org/apache/hyracks/control/nc/Task.java | 17 ++-
.../control/nc/io/profiling/IIOCounter.java | 8 +-
.../control/nc/io/profiling/IOCounterCache.java | 41 ++++++
.../nc/io/profiling/IOCounterDefault.java | 6 +-
.../nc/io/profiling/IOCounterFactory.java | 9 +-
.../nc/io/profiling/IOCounterIoStat.java | 101 +++++++++++++++
.../control/nc/io/profiling/IOCounterLinux.java | 128 -------------------
.../control/nc/io/profiling/IOCounterOSX.java | 6 +-
.../control/nc/io/profiling/IOCounterProc.java | 71 ++++++++++
.../control/nc/work/AbortAllJobsWork.java | 10 +-
.../nc/work/EnsureAllCcTasksCompleted.java | 102 +++++++++++++++
.../java/org/apache/hyracks/util/ExitUtil.java | 1 +
.../main/java/org/apache/hyracks/util/Span.java | 12 +-
17 files changed, 391 insertions(+), 170 deletions(-)
----------------------------------------------------------------------