The following pull request was submitted through Github. It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/3959
This e-mail was sent by the LXC bot, direct replies will not reach the author unless they happen to be subscribed to this list. === Description (from pull-request) === Signed-off-by: Stéphane Graber <[email protected]>
From 1f36bb9895819b7a2bccd715e8a4a5f456dd0d41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= <[email protected]> Date: Fri, 20 Oct 2017 13:02:13 -0400 Subject: [PATCH] Fix build with current version of bakery MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber <[email protected]> --- lxd/daemon.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lxd/daemon.go b/lxd/daemon.go index 38186e167..d5e3244e6 100644 --- a/lxd/daemon.go +++ b/lxd/daemon.go @@ -168,7 +168,7 @@ func writeMacaroonsRequiredResponse(b *bakery.Bakery, r *http.Request, w http.Re ctx := httpbakery.ContextWithRequest(context.TODO(), r) // Mint an appropriate macaroon and send it back to the client. m, err := b.Oven.NewMacaroon( - ctx, httpbakery.RequestVersion(r), time.Now().Add(5*time.Minute), derr.Caveats, derr.Ops...) + ctx, httpbakery.RequestVersion(r), derr.Caveats, derr.Ops...) if err != nil { resp := errorResponse{http.StatusInternalServerError, err.Error()} resp.Render(w)
_______________________________________________ lxc-devel mailing list [email protected] http://lists.linuxcontainers.org/listinfo/lxc-devel
