commit c8c74377599bd978aee1cf3b9b63a8634051cec2
author Brad Fitzpatrick <bradfitz@golang.org> Thu Apr 20 23:01:19 2017 +0000
committer Brad Fitzpatrick <bradfitz@golang.org> Fri Apr 21 00:26:09 2017 +0000
tree ece37097514e3c4bbd5247745dd9788d93a5104f
parent 5602c733f70afc6dcec6766be0d5034d4c4f14de

trace: use standard library context

Fixes golang/go#20056

Change-Id: I139d531ae87273fdc2409d29d63bb9d67680f30a
Reviewed-on: https://go-review.googlesource.com/41290
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

trace/trace.go

diff --git a/trace/trace.go b/trace/trace.go
index 64f56a3..1f250a2 100644
--- a/trace/trace.go
+++ b/trace/trace.go
@@ -64,6 +64,7 @@
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	"html/template"
 	"io"
@@ -77,7 +78,6 @@
 	"sync/atomic"
 	"time"
 
-	"golang.org/x/net/context"
 	"golang.org/x/net/internal/timeseries"
 )