diff options
| author | Neil Fuller <nfuller@google.com> | 2015-04-13 13:06:22 +0100 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2015-04-16 11:44:31 +0100 |
| commit | a2cab72aa5ff730ba2ae987b45398faafffeb505 (patch) | |
| tree | 283de306182e8f1faff93d4e6515298539d8c21d /benchmarks | |
| parent | 9fa0698523b8a573b8862c0e62c533be8bd53bda (diff) | |
| download | okhttp-a2cab72aa5ff730ba2ae987b45398faafffeb505.tar.gz | |
Roll-up of upstream OkHttp and Okio changes
OkHttp:
From b609edd07864d7191dcda8ba1f6c833c9fe170ad
to b40f99a950cb407eff52537a97420bd253a64f63
Okio:
From 654ddf5e8f6311fda77e429c22d5e0e15f713b8d
to b5811711b141b230e4e58f577c79cfbf4c2d4028
Both "to" are head as of 20150413.
Patches applied cleanly without conflicts.
This submission will break some CTS tests due
to https://github.com/square/okhttp/issues/1552
Solutions will be made upstream and patched in.
The CTS tests broken are related to SPDY/HTTP2
which are not used by Android's embedded OkHttp.
Change-Id: I84d55b6f5c8dbc05148e86bd9421a2c393b563d4
Diffstat (limited to 'benchmarks')
| -rw-r--r-- | benchmarks/pom.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 4fde956..3a5fccd 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>com.squareup.okhttp</groupId> <artifactId>parent</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.4.0-SNAPSHOT</version> </parent> <artifactId>benchmarks</artifactId> |