diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-03-13 16:17:12 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-03-13 16:18:15 +0100 |
| commit | 46ca8f383e53a3cf93d7ea9425e55ef972e8939b (patch) | |
| tree | dec6d2f7f1538969c8a6aa277621ad7636c7d89c | |
| parent | 60086ddc34eede0312e5ca2688bbbd01a373fa0a (diff) | |
| parent | faf316a43f2fe83fa39af95007692ec1f0efdde1 (diff) | |
| download | bitcoin-46ca8f383e53a3cf93d7ea9425e55ef972e8939b.tar.xz | |
Merge #12648: [0.16] test: Update trusted git root
faf316a43 test: Update trust git root (Wladimir J. van der Laan)
Pull request description:
Marco Falke's old key expired, causing a travis error while verifying
commits 36afd4db4442c45d4078b1a7ad16a1872b5bee0d and before:
gpg: Good signature from "Marco Falke <marco.falke@tum.de>" [unknown]
gpg: aka "Marco Falke <falke.marco@gmail.com>" [unknown]
gpg: Note: This key has expired!
Primary key fingerprint: B8B3 F1C0 E58C 15DB 6A81 D30C 3648 A882 F431 6B9B
Subkey fingerprint: FE09 B823 E6D8 3A3B C798 3EAA 2D7F 2372 E50F E137
Update the trusted root commit to the commit after that, to fix
this issue.
(cherry picked from commit 7deba93bdc76616011a9f493cbc203d60084416f)
Tree-SHA512: c86cc23d087af54a1448545c122fc67a0c556b5eac8ac7d16eeec8c42d8d0d81b7b5041f9a175787604aa47883b68403cfa01c10a52db64e35be52e559b20ec8
| -rw-r--r-- | contrib/verify-commits/trusted-git-root | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/verify-commits/trusted-git-root b/contrib/verify-commits/trusted-git-root index c60f8ab695..e560b98d02 100644 --- a/contrib/verify-commits/trusted-git-root +++ b/contrib/verify-commits/trusted-git-root @@ -1 +1 @@ -82bcf405f6db1d55b684a1f63a4aabad376cdad7 +11049f4fe62606d1b0380a9ef800ac130f0fbadf |