From 9cab1b30918dd7813a32913b5c01cd071b98ba84 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jul 2021 12:34:09 +0000
Subject: [PATCH 1/2] Bump dropshot from `feea258` to `3a9cb2b`

Bumps [dropshot](https://github.com/oxidecomputer/dropshot) from `feea258` to `3a9cb2b`.
- [Release notes](https://github.com/oxidecomputer/dropshot/releases)
- [Commits](https://github.com/oxidecomputer/dropshot/compare/feea2584eb3ce562a45e6696d51f8d6fa4b40a1e...3a9cb2ba9cb1c7da4c51937a82789d4d24de26f9)

---
updated-dependencies:
- dependency-name: dropshot
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 52e47c4828a..6d07c66d1e8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -404,7 +404,7 @@ dependencies = [
 [[package]]
 name = "dropshot"
 version = "0.5.2-dev"
-source = "git+https://github.com/oxidecomputer/dropshot?branch=main#feea2584eb3ce562a45e6696d51f8d6fa4b40a1e"
+source = "git+https://github.com/oxidecomputer/dropshot?branch=main#3a9cb2ba9cb1c7da4c51937a82789d4d24de26f9"
 dependencies = [
  "async-trait",
  "base64",
@@ -428,6 +428,7 @@ dependencies = [
  "slog-bunyan",
  "slog-json",
  "slog-term",
+ "syn",
  "tokio",
  "toml",
  "uuid",
@@ -436,7 +437,7 @@ dependencies = [
 [[package]]
 name = "dropshot_endpoint"
 version = "0.5.2-dev"
-source = "git+https://github.com/oxidecomputer/dropshot?branch=main#feea2584eb3ce562a45e6696d51f8d6fa4b40a1e"
+source = "git+https://github.com/oxidecomputer/dropshot?branch=main#3a9cb2ba9cb1c7da4c51937a82789d4d24de26f9"
 dependencies = [
  "proc-macro2",
  "quote",

From c62ab28916ede7f9755c932286a186c35fddb223 Mon Sep 17 00:00:00 2001
From: Sean Klein <sean@oxide.computer>
Date: Thu, 15 Jul 2021 18:08:51 -0400
Subject: [PATCH 2/2] Dropshot (hopefully) without abort issues

---
 Cargo.lock | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6d07c66d1e8..9a752402368 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -404,7 +404,7 @@ dependencies = [
 [[package]]
 name = "dropshot"
 version = "0.5.2-dev"
-source = "git+https://github.com/oxidecomputer/dropshot?branch=main#3a9cb2ba9cb1c7da4c51937a82789d4d24de26f9"
+source = "git+https://github.com/oxidecomputer/dropshot?branch=main#15acd1a0f8b78f3af9098e4839d570589b483fda"
 dependencies = [
  "async-trait",
  "base64",
@@ -419,6 +419,7 @@ dependencies = [
  "openapiv3",
  "paste",
  "percent-encoding",
+ "proc-macro2",
  "schemars",
  "serde",
  "serde_json",
@@ -437,7 +438,7 @@ dependencies = [
 [[package]]
 name = "dropshot_endpoint"
 version = "0.5.2-dev"
-source = "git+https://github.com/oxidecomputer/dropshot?branch=main#3a9cb2ba9cb1c7da4c51937a82789d4d24de26f9"
+source = "git+https://github.com/oxidecomputer/dropshot?branch=main#15acd1a0f8b78f3af9098e4839d570589b483fda"
 dependencies = [
  "proc-macro2",
  "quote",