>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20372?usp=email )
Change subject: Merge branch 'gerrit/trinity' into 'gerrit/ionic'
......................................................................
Merge branch 'gerrit/trinity' into 'gerrit/ionic'
* [NO ISSUE][*DB][NET] Upgrade Netty to 4.1.125.Final
Ext-ref: MB-68446
Change-Id: Ibba8683166a986f6d06b34e642e04019293f4372
---
M hyracks-fullstack/pom.xml
2 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 3cd0df9..20c4da5 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -75,14 +75,10 @@
<snappy.version>1.1.10.5</snappy.version>
<jackson.version>2.19.2</jackson.version>
<jackson-databind.version>${jackson.version}</jackson-databind.version>
-<<<<<<< HEAD (f1da2b [NO ISSUE][*DB][RT] Whisper logging for active
partition,txn)
- <netty.version>4.1.124.Final</netty.version>
+ <netty.version>4.1.125.Final</netty.version>
<asm.version>9.3</asm.version>
<awsjavasdk.version>2.29.27</awsjavasdk.version>
<gcsjavasdk.version>2.45.0</gcsjavasdk.version>
-=======
- <netty.version>4.1.125.Final</netty.version>
->>>>>>> BRANCH (acb1ad Merge branch 'gerrit/neo' into 'gerrit/trinity')
<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/+/20372?usp=email
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: asterixdb
Gerrit-Branch: ionic
Gerrit-Change-Id: Ibba8683166a986f6d06b34e642e04019293f4372
Gerrit-Change-Number: 20372
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-CC: Jenkins <[email protected]>
