Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

appveyor: pin hvsock to v0.11.1 #356

Merged
merged 1 commit into from
Nov 28, 2016
Merged

appveyor: pin hvsock to v0.11.1 #356

merged 1 commit into from
Nov 28, 2016

Conversation

djs55
Copy link
Collaborator

@djs55 djs55 commented Nov 24, 2016

This version has the 30ms -> 300ms connection timeout fix. The pin can be removed once [ocaml/opam-repository#7911] is merged and then pulled into the Windows opam-repository.

Signed-off-by: David Scott dave.scott@docker.com

@djs55
Copy link
Collaborator Author

djs55 commented Nov 24, 2016

/cc @simonferquel

@djs55
Copy link
Collaborator Author

djs55 commented Nov 24, 2016

It looks like the CI is unhappy with:

[WARNING] Upgrade is not possible because of conflicts or packages that are no
          longer available:
  - datakit-server>=0.7.0 is not available because the package is pinned to
    /Users/distiller/datakit, version 0.6.0.
The following dependencies are in cause:
  - datakit -> datakit-server >= 0.7.0

@samoht
Copy link
Member

samoht commented Nov 24, 2016

@djs55 this is because of CircleCI cache, you need to restart with a fresh cache...

I am trying to copy the setup of vpnkit to have a more reproducible environment for the CI.

@samoht
Copy link
Member

samoht commented Nov 24, 2016

@djs55 can you rebase? The build is failing because of a missing constraint that I have added in a previous PR.

This version has the 30ms -> 300ms connection timeout fix. The pin can
be removed once [ocaml/opam-repository#7911] is merged and then pulled
into the Windows opam-repository.

Signed-off-by: David Scott <dave.scott@docker.com>
@djs55
Copy link
Collaborator Author

djs55 commented Nov 28, 2016

@samoht are you happy to merge this? I'd like to include this in the next Docker for Mac.

@samoht samoht merged commit 6f04213 into moby:master Nov 28, 2016
@samoht
Copy link
Member

samoht commented Nov 28, 2016

LGTM, merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants