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/06/14 18:14:52 UTC

[5/5] asterixdb git commit: Merge branch 'release-0.9.4-pre-rc' into master

Merge branch 'release-0.9.4-pre-rc' into master

Change-Id: I5c0f14671f13c4415d1377f5044925032dd77cd1


Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/9da43ce3
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/9da43ce3
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/9da43ce3

Branch: refs/heads/master
Commit: 9da43ce398ef6494522bb67948a510103656887a
Parents: f1076cb 9353f35
Author: Michael Blow <mb...@apache.org>
Authored: Thu Jun 14 11:37:15 2018 -0400
Committer: Michael Blow <mb...@apache.org>
Committed: Thu Jun 14 11:37:15 2018 -0400

----------------------------------------------------------------------
 .../control/cc/ClusterControllerService.java    |  6 +--
 .../control/common/controllers/CCConfig.java    | 43 +++++++++++++++++++-
 .../control/common/controllers/NCConfig.java    |  6 +--
 .../java/org/apache/hyracks/util/MXHelper.java  | 26 +++++++-----
 4 files changed, 63 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9da43ce3/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/MXHelper.java
----------------------------------------------------------------------