>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21343?usp=email )
Change subject: Merge branch 'gerrit/morpheus' into 'master'
......................................................................
Merge branch 'gerrit/morpheus' into 'master'
* [NO ISSUE][MISC] Update Netty to 4.1.135.Final for CVEs (MB-72251)
* [NO ISSUE][MISC] Update Netty to 4.1.135.Final for CVEs (MB-72251)
Change-Id: I845ca80c33011df54f7a3abfbc96bfd330010f8a
---
M hyracks-fullstack/pom.xml
2 files changed, 6 insertions(+), 3 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/43/21343/1
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 571ca8e..98b62c6 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -77,7 +77,6 @@
<jackson-annotations.version>2.21</jackson-annotations.version>
<jackson-databind.version>${jackson.version}</jackson-databind.version>
<netty.version>4.1.135.Final</netty.version>
-<<<<<<< HEAD (92ebf1 Merge branch 'lumina')
<netty.tcnative.version>2.0.78.Final</netty.tcnative.version>
<asm.version>9.3</asm.version>
<awsjavasdk.version>2.44.14</awsjavasdk.version>
@@ -86,8 +85,6 @@
<google-cloud-storage.version>2.68.0</google-cloud-storage.version>
<!-- @derived-from:
com.google.cloud:google-cloud-storage:${google-cloud-storage.version}#dep:google-cloud-core
-->
<google-cloud-core.version>2.70.0</google-cloud-core.version>
-=======
->>>>>>> BRANCH (85f1f0 MB-72251: Null merge branch
'gerrit/stabilization-b4f3098763)
<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/+/21343?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: master
Gerrit-Change-Id: I845ca80c33011df54f7a3abfbc96bfd330010f8a
Gerrit-Change-Number: 21343
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
