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.

Sign up for GitHub

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

Jump to bottom

Use ConnSuite in state package instead of JujuConnSuite. #6317

Merged
merged 1 commit into from Sep 26, 2016
Merged

Use ConnSuite in state package instead of JujuConnSuite. #6317

merged 1 commit into from Sep 26, 2016

Conversation

anastasiamac
Copy link
Contributor

No description provided.

jameinel
jameinel approved these changes Sep 26, 2016
View reviewed changes
Copy link
Member

@jameinel jameinel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

I did double check that ConnSuite wasn't ultimately just a wrapper around JujuConnSuite but it appears to be distinct.

@anastasiamac
Copy link
Contributor Author

$$merge$$

@jujubot
Copy link
Collaborator

jujubot commented Sep 26, 2016

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

@jujubot
Copy link
Collaborator

jujubot commented Sep 26, 2016

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

@anastasiamac
Copy link
Contributor Author

unrelated failure in github.com/juju/juju/cmd/jujud/agent:
FAIL: machine_test.go:1034: MachineSuite.TestCertificateUpdateWorkerUpdatesCertificate
...
machine_test.go:1063:
s.assertChannelActive(c, updated, "certificate to be updated")
util_test.go:104:
c.Fatalf("timeout while waiting for %v", intent)
... Error: timeout while waiting for certificate to be updated

$$merge$$

@jujubot
Copy link
Collaborator

jujubot commented Sep 26, 2016

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

@jujubot jujubot merged commit b5857c4 into juju:master Sep 26, 2016
@anastasiamac anastasiamac deleted the remove-jujuconnsuite-state branch September 26, 2016 11:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jameinel jameinel jameinel approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@anastasiamac @jujubot @jameinel