From dbec9aa7e2c342866a89f6abd974421977054d06 Mon Sep 17 00:00:00 2001 From: Sean Klein Date: Wed, 15 Nov 2023 20:08:09 -0800 Subject: [PATCH] Point to branch --- Cargo.lock | 1 + Cargo.toml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index fc6f8ea373..13844c61fc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -287,6 +287,7 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-bb8-diesel" version = "0.1.0" +source = "git+https://github.com/oxidecomputer/async-bb8-diesel?branch=txn-retry#14bd98be8c76b36cc04464f06ffa5894b7240ab5" dependencies = [ "async-trait", "bb8", diff --git a/Cargo.toml b/Cargo.toml index 5f3963d92e..b4dbbd7757 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -140,8 +140,9 @@ api_identity = { path = "api_identity" } approx = "0.5.1" assert_matches = "1.5.0" assert_cmd = "2.0.12" +# TODO: Patch before merging # async-bb8-diesel = { git = "https://github.com/oxidecomputer/async-bb8-diesel", rev = "1446f7e0c1f05f33a0581abd51fa873c7652ab61" } -async-bb8-diesel = { path = "../../async-bb8-diesel" } +async-bb8-diesel = { git = "https://github.com/oxidecomputer/async-bb8-diesel", branch = "txn-retry" } async-trait = "0.1.74" atomicwrites = "0.4.2" authz-macros = { path = "nexus/authz-macros" }