Commit 12f68a0f authored by Paul Hobbs's avatar Paul Hobbs Committed by chrome-bot
Browse files

manifest: Remove oauth2client and upgrade swarming

It turns out swarming.client already depends on oauth2client, so the
extra oauth2client in chromite/third_party is superfluous and can
conflict with it if the versions differ.

The ts-mon library requires oauth2client to be at a newer version (with
the GoogleCredentials class), so this change upgrades swarming.client to
a revision which has the newer oauth2client.

BUG=chromium:583705
TEST=None
CQ-DEPEND=CL:*247148

Change-Id: Ibe670334cb6b7dfc26eb815c01579fa03a0f8cfa
Reviewed-on: https://chromium-review.googlesource.com/325820


Commit-Ready: Paul Hobbs <phobbs@google.com>
Tested-by: default avatarPaul Hobbs <phobbs@google.com>
Reviewed-by: default avatarPaul Hobbs <phobbs@google.com>
parent 74fd6d57
......@@ -25,10 +25,6 @@ Your sources have been sync'd successfully.
<project path="chromite/third_party/gdata"
groups="minilayout,project_sdk,buildtools"
name="chromiumos/third_party/gdata" />
<project path="chromite/third_party/oauth2client"
groups="minilayout,project_sdk,buildtools"
name="external/github.com/google/oauth2client"
revision="refs/tags/v1.5.2" />
<project path="chromite/third_party/pyelftools"
groups="minilayout,project_sdk,buildtools"
name="chromiumos/third_party/pyelftools"
......@@ -36,7 +32,7 @@ Your sources have been sync'd successfully.
<project path="chromite/third_party/swarming.client"
groups="minilayout,project_sdk,buildtools"
name="external/swarming.client"
revision="a76b9eed7a56c4fd587ace548226e8e8697dbd15"
revision="715861067a7cc8d20d2d629b6d76d796c004feb4"
remote="chromium" />
<project path="src/platform2" name="chromiumos/platform2" />
<project path="src/platform2/glbench/images"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment