>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19029 )
Change subject: Merge branch 'gerrit/neo' into 'gerrit/trinity'
......................................................................
Merge branch 'gerrit/neo' into 'gerrit/trinity'
Ext-ref: MB-63390
Change-Id: I7bfdd27310d9c2faa1e4f5e84070782a560d287a
---
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
2 files changed, 14 insertions(+), 4 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
index eb1c63e..01e47b5 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
@@ -87,11 +87,7 @@
LOGGER.debug("listener not found for entity {} on event {} for
job {}", entityId, event, jobId);
}
} else {
-<<<<<<< HEAD (3f20e3 Merge branch gerrit/neo into gerrit/trinity)
- LOGGER.error("entity not found for event {}", event);
-=======
LOGGER.log(Level.ERROR, "entity not found for event {} for job
{}", eventKind, jobId);
->>>>>>> BRANCH (f1b9c8 [NO ISSUE] Misc fixes)
}
return Optional.ofNullable(listener);
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19029
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: I7bfdd27310d9c2faa1e4f5e84070782a560d287a
Gerrit-Change-Number: 19029
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-CC: Anon. E. Moose #1000171
Gerrit-MessageType: merged
