>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18359 )
Change subject: Merge branch 'gerrit/neo' into 'gerrit/trinity'
......................................................................
Merge branch 'gerrit/neo' into 'gerrit/trinity'
Change-Id: I67f246de4e36b19085525cb4a6afe5a4f9e92212
---
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/result/ResultDirectoryService.java
2 files changed, 14 insertions(+), 5 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/59/18359/1
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/result/ResultDirectoryService.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/result/ResultDirectoryService.java
index eb155fc..b6274d9 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/result/ResultDirectoryService.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/result/ResultDirectoryService.java
@@ -78,13 +78,8 @@
}
@Override
-<<<<<<< HEAD (f9681d Merge branch 'gerrit/neo' into 'gerrit/trinity')
public synchronized void notifyJobCreation(JobId jobId, JobSpecification
spec,
IJobCapacityController.JobSubmissionStatus status) throws
HyracksException {
- LOGGER.debug("{} notified of new job {}", getClass().getSimpleName(),
jobId);
-=======
- public synchronized void notifyJobCreation(JobId jobId, JobSpecification
spec) throws HyracksException {
->>>>>>> BRANCH (3b07af Merge branch 'gerrit/stabilization-40cfb8705b' into
'gerrit/)
if (jobResultLocations.get(jobId) != null) {
throw HyracksDataException.create(ErrorCode.MORE_THAN_ONE_RESULT,
jobId);
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18359
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: trinity
Gerrit-Change-Id: I67f246de4e36b19085525cb4a6afe5a4f9e92212
Gerrit-Change-Number: 18359
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-MessageType: newchange
