Michael Blow has submitted this change and it was merged. (
https://asterix-gerrit.ics.uci.edu/3418 )
Change subject: Merge commit '79b243' from stabilization-f69489
......................................................................
Merge commit '79b243' from stabilization-f69489
Change-Id: Ie2387663ab0cd4544eb9ec6f12ec2ba74136ef83
---
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java
2 files changed, 0 insertions(+), 5 deletions(-)
Approvals:
Till Westmann: Looks good to me, approved
Jenkins: Verified; Verified
Objections:
Jenkins: Violations found
Anon. E. Moose (1000171): Violations found
diff --git
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
index bb4c546..1e92f16 100644
---
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
@@ -218,13 +218,8 @@
IIPCI ciIPCI = new ClientInterfaceIPCI(this, jobIdFactory);
clientIPC =
new IPCSystem(new
InetSocketAddress(ccConfig.getClientListenAddress(),
ccConfig.getClientListenPort()),
-<<<<<<< HEAD (84f734 [ASTERIXDB-2579][DOC] Document uuid/upsert/insert
behavior)
networkSecurityManager.getSocketChannelFactory(),
ciIPCI,
new
JavaSerializationBasedPayloadSerializerDeserializer());
- webServer = new WebServer(this, ccConfig.getConsoleListenPort());
-=======
- ciIPCI, new
JavaSerializationBasedPayloadSerializerDeserializer());
->>>>>>> BRANCH (79b243 [NO ISSUE][OTH] Make ClusterControllerService
Extensible)
clusterIPC.start();
clientIPC.start();
startWebServers();
--
To view, visit https://asterix-gerrit.ics.uci.edu/3418
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2387663ab0cd4544eb9ec6f12ec2ba74136ef83
Gerrit-Change-Number: 3418
Gerrit-PatchSet: 2
Gerrit-Owner: Murtadha Hubail <[email protected]>
Gerrit-Reviewer: Anon. E. Moose (1000171)
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-Reviewer: Till Westmann <[email protected]>
