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

Revert "Merge pull request #7013 from howbazaar/gorilla-websocket" #7029

Merged
merged 1 commit into from
Feb 23, 2017
Merged

Revert "Merge pull request #7013 from howbazaar/gorilla-websocket" #7029

merged 1 commit into from
Feb 23, 2017

Conversation

sinzui
Copy link
Contributor

@sinzui sinzui commented Feb 23, 2017

Description of change

This reverts commit f06c3e9, reversing
changes made to 3c535e6.

Please provide the following details to expedite Pull Request review:

The Gorilla websockets change broke restore-backup
The bootstrap under proxied conditions is also broken,

QA steps

We expect juju to bootstrap under proxied conditions and restore-backup to work again.

Documentation changes

None

Bug reference

https://bugs.launchpad.net/juju/+bug/1666898

This reverts commit f06c3e9, reversing
changes made to 3c535e6.
@sinzui
Copy link
Contributor Author

sinzui commented Feb 23, 2017

$$merge$$

@jujubot
Copy link
Collaborator

jujubot commented Feb 23, 2017

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

@jujubot
Copy link
Collaborator

jujubot commented Feb 23, 2017

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/10350

@jujubot
Copy link
Collaborator

jujubot commented Feb 23, 2017

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/10351

@jujubot
Copy link
Collaborator

jujubot commented Feb 23, 2017

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/10352

@jujubot
Copy link
Collaborator

jujubot commented Feb 23, 2017

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/10353

@jujubot
Copy link
Collaborator

jujubot commented Feb 23, 2017

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/10354

@jujubot jujubot merged commit ca2498e into juju:develop Feb 23, 2017
howbazaar added a commit to howbazaar/juju that referenced this pull request Feb 26, 2017
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