diff --git a/disable-pprof-trace.patch b/disable-pprof-trace.patch deleted file mode 100644 index bae3c91..0000000 --- a/disable-pprof-trace.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/api/server/profiler.go b/api/server/profiler.go -index 8bf8384..c062f2d 100644 ---- a/api/server/profiler.go -+++ b/api/server/profiler.go -@@ -18,7 +18,8 @@ func profilerSetup(mainRouter *mux.Router) { - r.HandleFunc("/pprof/cmdline", pprof.Cmdline) - r.HandleFunc("/pprof/profile", pprof.Profile) - r.HandleFunc("/pprof/symbol", pprof.Symbol) -- r.HandleFunc("/pprof/trace", pprof.Trace) -+ // pprof.Trace is not available in go <= 1.4 -+ // r.HandleFunc("/pprof/trace", pprof.Trace) - r.HandleFunc("/pprof/block", pprof.Handler("block").ServeHTTP) - r.HandleFunc("/pprof/heap", pprof.Handler("heap").ServeHTTP) - r.HandleFunc("/pprof/goroutine", pprof.Handler("goroutine").ServeHTTP) diff --git a/docker.changes b/docker.changes index 72a6e8a..b598f09 100644 --- a/docker.changes +++ b/docker.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Aug 25 14:02:04 UTC 2016 - jmassaguerpla@suse.com + +- remove disable-pprof-trace.patch: We can remove this patch because + we use go 1.6, either gcc6-go or gc-go. This patch was for gcc5-go + ------------------------------------------------------------------- Wed Aug 24 12:31:23 UTC 2016 - jmassaguerpla@suse.com diff --git a/docker.spec b/docker.spec index 19df8b8..7415733 100644 --- a/docker.spec +++ b/docker.spec @@ -63,7 +63,6 @@ Source9: docker-update-message.txt Patch100: gcc-go-patches.patch Patch101: netlink_gcc_go.patch Patch102: netlink_netns_powerpc.patch -Patch103: disable-pprof-trace.patch Patch200: docker-mount-secrets.patch BuildRequires: audit BuildRequires: bash-completion @@ -178,7 +177,6 @@ Test package for docker. It contains the source code and the tests. %patch100 -p1 %patch101 -p1 %patch102 -p1 -%patch103 -p1 %endif cp %{SOURCE7} .