Merge branch 'master' into el6

Rebase to 1.11.2
2018-11-23 14:21:44 +01:00 · 2018-11-23 14:21:44 +01:00 · a35b3718c0
parent be0aa0461a b86284b4f3
commit a35b3718c0
3 changed files with 7 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -52,3 +52,4 @@
 /go1.9.6.src.tar.gz
 /go1.9.7.src.tar.gz
 /go1.11.1.src.tar.gz
+/go1.11.2.src.tar.gz
--- a/golang.spec
+++ b/golang.spec
@ -99,10 +99,10 @@
 %endif

 %global go_api 1.11
-%global go_version 1.11.1
+%global go_version 1.11.2

 Name:           golang
-Version:        1.11.1
+Version:        1.11.2
 Release:        1%{?dist}
 Summary:        The Go Programming Language
 # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
@ -571,6 +571,9 @@ fi
 %endif

 %changelog
+* Fri Nov 23 2018 Jakub Čajka <jcajka@redhat.com> - 1.11.2-1
+- Rebase to go1.11.2
+
 * Sun Oct 07 2018 Jakub Čajka <jcajka@redhat.com> - 1.11.1-1
 - Rebase to go1.11.1

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (go1.11.1.src.tar.gz) = 9c19f40b24f2180563705511a5692932c0db3585939053e6d78eea1f394902d37f05b0386f0e7d0c0266178de7e9bd7b003324ed232ce2e5050c9faafafdd979
+SHA512 (go1.11.2.src.tar.gz) = 3d9b182718c7615975a4b47cecb9ff2a8ce62156461e4112452c14617ea226121e7ab736a469050f14c89861cc4934ddd2df295b80fffff0a2dd6c155eaf0aee