>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17651 )
Change subject: Merge branch 'gerrit/mad-hatter' into 'gerrit/neo'
......................................................................
Merge branch 'gerrit/mad-hatter' into 'gerrit/neo'
Change-Id: I7fcd4f954796bafa7f9452306c5b5e6eb3a540e6
---
M hyracks-fullstack/pom.xml
2 files changed, 15 insertions(+), 29 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/51/17651/1
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 5d0abd8..f253bdb 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -76,7 +76,7 @@
<snappy.version>1.1.10.1</snappy.version>
<jackson.version>2.14.3</jackson.version>
<jackson-databind.version>${jackson.version}</jackson-databind.version>
- <netty.version>4.1.87.Final</netty.version>
+ <netty.version>4.1.94.Final</netty.version>
<implementation.title>Apache Hyracks and Algebricks -
${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
@@ -88,66 +88,41 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
-<<<<<<< HEAD (04b1dd Merge branch 'gerrit/stabilization-667a908755' into neo)
<version>${netty.version}</version>
-=======
- <version>4.1.94.Final</version>
->>>>>>> BRANCH (84c47c Merge branch 'gerrit/stabilization-5949a1cb71' into
'gerrit/)
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
-<<<<<<< HEAD (04b1dd Merge branch 'gerrit/stabilization-667a908755' into neo)
<version>${netty.version}</version>
-=======
- <version>4.1.94.Final</version>
->>>>>>> BRANCH (84c47c Merge branch 'gerrit/stabilization-5949a1cb71' into
'gerrit/)
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
-<<<<<<< HEAD (04b1dd Merge branch 'gerrit/stabilization-667a908755' into neo)
<version>${netty.version}</version>
-=======
- <version>4.1.94.Final</version>
->>>>>>> BRANCH (84c47c Merge branch 'gerrit/stabilization-5949a1cb71' into
'gerrit/)
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
-<<<<<<< HEAD (04b1dd Merge branch 'gerrit/stabilization-667a908755' into neo)
<version>${netty.version}</version>
-=======
- <version>4.1.94.Final</version>
->>>>>>> BRANCH (84c47c Merge branch 'gerrit/stabilization-5949a1cb71' into
'gerrit/)
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
-<<<<<<< HEAD (04b1dd Merge branch 'gerrit/stabilization-667a908755' into neo)
<version>${netty.version}</version>
-=======
- <version>4.1.94.Final</version>
->>>>>>> BRANCH (84c47c Merge branch 'gerrit/stabilization-5949a1cb71' into
'gerrit/)
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
-<<<<<<< HEAD (04b1dd Merge branch 'gerrit/stabilization-667a908755' into neo)
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler-proxy</artifactId>
<version>${netty.version}</version>
-=======
- <version>4.1.94.Final</version>
->>>>>>> BRANCH (84c47c Merge branch 'gerrit/stabilization-5949a1cb71' into
'gerrit/)
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-classes-epoll</artifactId>
-<<<<<<< HEAD (04b1dd Merge branch 'gerrit/stabilization-667a908755' into neo)
<version>${netty.version}</version>
</dependency>
<dependency>
@@ -164,9 +139,6 @@
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
<version>${netty.version}</version>
-=======
- <version>4.1.94.Final</version>
->>>>>>> BRANCH (84c47c Merge branch 'gerrit/stabilization-5949a1cb71' into
'gerrit/)
</dependency>
<dependency>
<groupId>junit</groupId>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17651
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: neo
Gerrit-Change-Id: I7fcd4f954796bafa7f9452306c5b5e6eb3a540e6
Gerrit-Change-Number: 17651
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-MessageType: newchange
