resource/api/server: move UnitResourceHandler to public api/server package #4688

Merged
merged 2 commits into from Mar 11, 2016

Conversation

Projects
None yet
2 participants
Contributor

davecheney commented Mar 11, 2016

The resources' API had two http handlers, one for services one for units, implemented in two different ways one living inside a private (whatever that means) package. This meant the apiserver had a dependency on apiserver/common via it's import of resources/api/private/server even though the type it was importing did not have anything to do with this transitive dependency.

This change moves both handlers to the public resources/api/server package, renaming them to something more descriptive.

(Review request: http://reviews.vapour.ws/r/4127/)

Contributor

davecheney commented Mar 11, 2016

$$JFDI$$

Contributor

jujubot commented Mar 11, 2016

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

jujubot added a commit that referenced this pull request Mar 11, 2016

Merge pull request #4688 from davecheney/resource-api-merge-two-servers
resource/api/server: move UnitResourceHandler to public api/server package

The resources' API had two http handlers, one for services one for units, implemented in two different ways one living inside a _private_ (whatever that means) package. This meant the apiserver had a dependency on apiserver/common via it's import of resources/api/private/server even though the type it was importing did not have anything to do with this transitive dependency.

This change moves both handlers to the public resources/api/server package, renaming them to something more descriptive.

(Review request: http://reviews.vapour.ws/r/4127/)

@jujubot jujubot merged commit ae58617 into juju:master Mar 11, 2016

@davecheney davecheney deleted the davecheney:resource-api-merge-two-servers branch Mar 11, 2016

ericsnowcurrently added a commit to ericsnowcurrently/juju that referenced this pull request Mar 17, 2016

Revert "Merge pull request #4688 from davecheney/resource-api-merge-t…
…wo-servers"

This reverts commit ae58617, reversing
changes made to db52fff.

ericsnowcurrently added a commit to ericsnowcurrently/juju that referenced this pull request Mar 17, 2016

Revert "Merge pull request #4688 from davecheney/resource-api-merge-t…
…wo-servers"

This reverts commit ae58617, reversing
changes made to db52fff.

ericsnowcurrently added a commit to ericsnowcurrently/juju that referenced this pull request Mar 21, 2016

Revert "Merge pull request #4688 from davecheney/resource-api-merge-t…
…wo-servers"

This reverts commit ae58617, reversing
changes made to db52fff.

ericsnowcurrently added a commit to ericsnowcurrently/juju that referenced this pull request Mar 29, 2016

Revert "Merge pull request #4688 from davecheney/resource-api-merge-t…
…wo-servers"

This reverts commit ae58617, reversing
changes made to db52fff.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment