>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20827?usp=email )
Change subject: Merge branch 'gerrit/neo' into 'gerrit/trinity'
......................................................................
Merge branch 'gerrit/neo' into 'gerrit/trinity'
* [NO ISSUE][*DB][EXT] Advance GCS dependencies (MB-70233)
Ext-ref: MB-70233
Change-Id: I50bfc9b3bf2d4dd1984af9668b2bab2304c61ef1
---
M asterixdb/pom.xml
2 files changed, 10 insertions(+), 6 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/27/20827/1
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index ec5c672..3802582 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -1846,9 +1846,13 @@
</dependency>
<dependency>
<groupId>io.grpc</groupId>
-<<<<<<< HEAD (c219e3 Merge branch 'gerrit/neo' into 'gerrit/trinity')
+ <artifactId>grpc-netty-shaded</artifactId>
+ <version>1.78.0</version>
+ </dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
<artifactId>grpc-census</artifactId>
- <version>1.68.1</version>
+ <version>1.76.2</version>
</dependency>
<dependency>
<groupId>io.opencensus</groupId>
@@ -1894,10 +1898,6 @@
<groupId>io.opencensus</groupId>
<artifactId>opencensus-contrib-grpc-metrics</artifactId>
<version>${io.opencensus.version}</version>
-=======
- <artifactId>grpc-netty-shaded</artifactId>
- <version>1.78.0</version>
->>>>>>> BRANCH (ec4a3f Merge branch 'gerrit/stabilization-667a908755' into
'gerrit/)
</dependency>
</dependencies>
</dependencyManagement>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20827?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: I50bfc9b3bf2d4dd1984af9668b2bab2304c61ef1
Gerrit-Change-Number: 20827
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
