Skip to content

Commit

Permalink
Merge pull request square#3229 from grimreaper/eax/simplecon/a1/32ba7e9
Browse files Browse the repository at this point in the history
Remove some some duplicate words
  • Loading branch information
JakeWharton authored Mar 19, 2017
2 parents 928f62a + 68a2264 commit d5db954
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ _2016-11-30_
* New: Expose `Part` headers and body in `Multipart`.
* New: Make `ResponseBody.string()` and `ResponseBody.charStream()` BOM-aware. If your HTTP
response body begins with a [byte order mark][bom] it will be consumed and used to select a
charset for the remaining bytes. Most applications should not not need a byte order mark.
charset for the remaining bytes. Most applications should not need a byte order mark.

* New: Upgrade to Okio 1.11.0.

Expand Down Expand Up @@ -754,7 +754,7 @@ _2014-12-30_
* New: APIs to iterate and selectively clear the response cache.
* New: Support for SOCKS proxies.
* New: Support for `TLS_FALLBACK_SCSV`.
* New: Update HTTP/2 support to to `h2-16` and `hpack-10`.
* New: Update HTTP/2 support to `h2-16` and `hpack-10`.
* New: APIs to prevent retrying non-idempotent requests.
* Fix: Drop NPN support. Going forward we support ALPN only.
* Fix: The hostname verifier is now strict. This is consistent with the hostname
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1534,7 +1534,7 @@ public final class Http2ConnectionTest {
assertEquals(0, connection.bytesLeftInWriteWindow);
assertEquals(0, connection.getStream(3).bytesLeftInWriteWindow);

// receiving a window update on the the connection will unblock new streams.
// receiving a window update on the connection will unblock new streams.
connection.readerRunnable.windowUpdate(0, 3);

assertEquals(3, connection.bytesLeftInWriteWindow);
Expand Down
2 changes: 1 addition & 1 deletion okhttp/src/main/java/okhttp3/internal/Util.java
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ public static ThreadFactory threadFactory(final String name, final boolean daemo
}

/**
* Returns an array containing containing only elements found in {@code first} and also in {@code
* Returns an array containing only elements found in {@code first} and also in {@code
* second}. The returned elements are in the same order as in {@code first}.
*/
@SuppressWarnings("unchecked")
Expand Down

0 comments on commit d5db954

Please sign in to comment.