This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 117e5aaf6613796f1d9e9953800382f8b3f9c45d Merge: d3612260a4 b0f3ef4e1c Author: Michael Blow <[email protected]> AuthorDate: Fri Aug 9 16:18:18 2024 -0400 Merge branch 'gerrit/neo' into 'gerrit/trinity' Ext-ref: MB-63076 Change-Id: I1f6b6ce28e5e8d4e4c94f75117777bc8e1077b37 .../java/org/apache/hyracks/control/cc/ClusterControllerService.java | 4 +++- .../java/org/apache/hyracks/control/nc/NodeControllerService.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --cc hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java index d6698fe703,c9ac4efac9..a386ab8941 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java @@@ -34,8 -34,8 +34,9 @@@ import java.util.Timer import java.util.TimerTask; import java.util.TreeMap; import java.util.concurrent.ExecutorService; + import java.util.concurrent.Executors; +import org.apache.hyracks.api.application.IApplication; import org.apache.hyracks.api.application.ICCApplication; import org.apache.hyracks.api.client.ClusterControllerInfo; import org.apache.hyracks.api.comm.NetworkAddress;
