Skip to content

Commit

Permalink
Revert "[release-branch.go1.10] all: merge master into release-branch…
Browse files Browse the repository at this point in the history
….go1.10"

This reverts commit b83d7f7.

Reason for revert: wrong branch

Change-Id: I28ebb121f7b3e331729e8a6a00961b876f3dd0f2
Reviewed-on: https://go-review.googlesource.com/93455
Reviewed-by: Andrew Bonventre <[email protected]>
  • Loading branch information
andybons committed Feb 12, 2018
1 parent b83d7f7 commit 3b6abd8
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 20 deletions.
7 changes: 7 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Please do not send pull requests to the golang/* repositories.

We do, however, take contributions gladly.

See https://golang.org/doc/contribute.html

Thanks!
5 changes: 5 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ 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.

7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,10 @@ 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 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.
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.

[rf]: https://reneefrench.blogspot.com/
[cc3-by]: https://creativecommons.org/licenses/by/3.0/
13 changes: 0 additions & 13 deletions doc/devel/release.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,6 @@ <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>
Expand Down Expand Up @@ -120,13 +114,6 @@ <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>
Expand Down
2 changes: 1 addition & 1 deletion doc/diagnostics.html
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ <h2 id="tracing">Tracing</h2>
<p>Tracing enables us to:</p>

<ul>
<li>Instrument and analyze application latency in a Go process.</li>
<li>Instrument and profile 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>
Expand Down
3 changes: 1 addition & 2 deletions doc/go1.10.html
Original file line number Diff line number Diff line change
Expand Up @@ -785,8 +785,7 @@ <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>. Certificates with
invalid values for those fields are now rejected.
<code>PermittedURIDomains</code>, and <code>ExcludedURIDomains</code>.
</p>

<p>
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/fix/cftype.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func typefix(f *ast.File, badType func(string) bool) bool {
if !ok {
return
}
t, ok := s.X.(*ast.SelectorExpr)
t := s.X.(*ast.SelectorExpr)
if !ok {
return
}
Expand Down

0 comments on commit 3b6abd8

Please sign in to comment.