Permalink
Browse files

all: restore changes from faulty merge/revert

This reverts commit 3b6abd8.

Change-Id: I8ca100501c1844af78a547989786d14dac6b494a
Reviewed-on: https://go-review.googlesource.com/93456
Reviewed-by: Andrew Bonventre <andybons@golang.org>
  • Loading branch information...
andybons committed Feb 12, 2018
1 parent 3b6abd8 commit 4c4ce3dc79fcf535045e69068b15142d8b7259cd
Showing with 20 additions and 19 deletions.
  1. +0 −7 .github/PULL_REQUEST_TEMPLATE
  2. +0 −5 CONTRIBUTING.md
  3. +3 −4 README.md
  4. +13 −0 doc/devel/release.html
  5. +1 −1 doc/diagnostics.html
  6. +2 −1 doc/go1.10.html
  7. +1 −1 src/cmd/fix/cftype.go

This file was deleted.

Oops, something went wrong.
@@ -30,11 +30,6 @@ For change proposals, see [Proposing Changes To Go](https://github.com/golang/pr
Please read the [Contribution Guidelines](https://golang.org/doc/contribute.html) before sending patches.
**We do not accept GitHub pull requests**
(we use [an instance](https://go-review.googlesource.com/) of the
[Gerrit](https://www.gerritcodereview.com/) code review system instead).
Also, please do not post patches on the issue tracker.
Unless otherwise noted, the Go source files are distributed under
the BSD-style license found in the LICENSE file.
@@ -36,10 +36,9 @@ Go is the work of hundreds of contributors. We appreciate your help!
To contribute, please read the contribution guidelines:
https://golang.org/doc/contribute.html
Note that the Go project does not use GitHub pull requests, and that
we use the issue tracker for bug reports and proposals only. See
https://golang.org/wiki/Questions for a list of places to ask
questions about the Go language.
Note that the Go project uses the issue tracker for bug reports and
proposals only. See https://golang.org/wiki/Questions for a list of
places to ask questions about the Go language.
[rf]: https://reneefrench.blogspot.com/
[cc3-by]: https://creativecommons.org/licenses/by/3.0/
@@ -57,6 +57,12 @@ <h3 id="go1.9.minor">Minor revisions</h3>
1.9.3 milestone</a> on our issue tracker for details.
</p>
<p>
go1.9.4 (released 2018/02/07) includes a security fix to “go get”.
See the <a href="https://github.com/golang/go/issues?q=milestone%3AGo1.9.4">Go
1.9.4</a> milestone on our issue tracker for details.
</p>
<h2 id="go1.8">go1.8 (released 2017/02/16)</h2>
<p>
@@ -114,6 +120,13 @@ <h3 id="go1.8.minor">Minor revisions</h3>
1.8.6 milestone</a> on our issue tracker for details.
</p>
<p>
go1.8.7 (released 2018/02/07) includes a security fix to “go get”.
It contains the same fix as Go 1.9.4 and was released at the same time.
See the <a href="https://github.com/golang/go/issues?q=milestone%3AGo1.8.7">Go
1.8.7</a> milestone on our issue tracker for details.
</p>
<h2 id="go1.7">go1.7 (released 2016/08/15)</h2>
<p>
@@ -222,7 +222,7 @@ <h2 id="tracing">Tracing</h2>
<p>Tracing enables us to:</p>
<ul>
<li>Instrument and profile application latency in a Go process.</li>
<li>Instrument and analyze application latency in a Go process.</li>
<li>Measure the cost of specific calls in a long chain of calls.</li>
<li>Figure out the utilization and performance improvements.
Bottlenecks are not always obvious without tracing data.</li>
@@ -785,7 +785,8 @@ <h3 id="minor_library_changes">Minor changes to the library</h3>
<a href="/pkg/crypto/x509/#Certificate"><code>Certificate</code></a> fields
<code>URIs</code>, <code>PermittedIPRanges</code>, <code>ExcludedIPRanges</code>,
<code>PermittedEmailAddresses</code>, <code>ExcludedEmailAddresses</code>,
<code>PermittedURIDomains</code>, and <code>ExcludedURIDomains</code>.
<code>PermittedURIDomains</code>, and <code>ExcludedURIDomains</code>. Certificates with
invalid values for those fields are now rejected.
</p>
<p>
@@ -119,7 +119,7 @@ func typefix(f *ast.File, badType func(string) bool) bool {
if !ok {
return
}
t := s.X.(*ast.SelectorExpr)
t, ok := s.X.(*ast.SelectorExpr)
if !ok {
return
}

0 comments on commit 4c4ce3d

Please sign in to comment.