>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20786?usp=email )
Change subject: Merge branch 'gerrit/neo' into 'gerrit/trinity'
......................................................................
Merge branch 'gerrit/neo' into 'gerrit/trinity'
* [NO ISSUE][HYR][NET] Advance Netty to 4.1.130.Final (MB-70073)
* [NO ISSUE][*DB][EXT] Advance msgpack-core to 0.9.11 (MB-70074)
Change-Id: Iafecf89871ad0a111d5aea5f7c1b0ab92cd79fa5
---
M hyracks-fullstack/pom.xml
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/86/20786/1
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index dea34fc..a8ea92c 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -75,11 +75,7 @@
<snappy.version>1.1.10.5</snappy.version>
<jackson.version>2.19.2</jackson.version>
<jackson-databind.version>${jackson.version}</jackson-databind.version>
-<<<<<<< HEAD (b9488a [ASTERIXDB-3683][COMP] Fix isomorphic window joins)
- <netty.version>4.1.128.Final</netty.version>
-=======
<netty.version>4.1.130.Final</netty.version>
->>>>>>> BRANCH (fce80c [NO ISSUE][*DB][EXT] Advance msgpack-core to 0.9.11)
<implementation.title>Apache Hyracks and Algebricks -
${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20786?usp=email
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: asterixdb
Gerrit-Branch: trinity
Gerrit-Change-Id: Iafecf89871ad0a111d5aea5f7c1b0ab92cd79fa5
Gerrit-Change-Number: 20786
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
