/juju

apiserver/common: move RestoreError to resource/api #4691

Merged
merged 4 commits into from Mar 11, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@davecheney @jujubot @kat-co
@davecheney
Contributor

davecheney commented Mar 11, 2016

RestoreError is only used by the resources and payload apis, it is not part of the common api.

Moving RestoreError to resource/api enables further refactoring of the helpers and constants inside apiserver/common and resource/api, moving as much of the support logic for RestoreError out of apiserver/common.

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

@davecheney davecheney changed the title from apiserver/commoni: move RestoreError to resource/api to apiserver/common: move RestoreError to resource/api Mar 11, 2016

@davecheney
Contributor

davecheney commented Mar 11, 2016

$$JFDI$$
@jujubot
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

@jujubot
Merge pull request #4691 from davecheney/resource-api-move-apiserver-… 
…common-restoreerror

apiserver/common: move RestoreError to resource/api

RestoreError is only used by the resources and payload apis, it is not part of the common api. 

Moving RestoreError to resource/api enables further refactoring of the helpers and constants inside apiserver/common and resource/api, moving as much of the support logic for RestoreError out of apiserver/common.

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

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

@davecheney davecheney deleted the davecheney:resource-api-move-apiserver-common-restoreerror branch Mar 11, 2016

@davecheney davecheney restored the davecheney:resource-api-move-apiserver-common-restoreerror branch Mar 11, 2016

@davecheney davecheney deleted the davecheney:resource-api-move-apiserver-common-restoreerror branch Mar 11, 2016

@davecheney davecheney restored the davecheney:resource-api-move-apiserver-common-restoreerror branch Mar 11, 2016

payload/api/private/helpers.go
@@ -14,6 +14,7 @@ import (
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/payload"
"github.com/juju/juju/payload/api"
+ resourcesapi "github.com/juju/juju/resource/api"
@kat-co

kat-co Mar 11, 2016

Contributor

This is really bad...

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

@ericsnowcurrently
Revert "Merge pull request #4691 from davecheney/resource-api-move-ap… 
…iserver-common-restoreerror"

This reverts commit cc383e1, reversing
changes made to ae58617.
8a3ca9a

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

@ericsnowcurrently
Revert "Merge pull request #4691 from davecheney/resource-api-move-ap… 
…iserver-common-restoreerror"

This reverts commit cc383e1, reversing
changes made to ae58617.
a81cdb0

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

@ericsnowcurrently
Revert "Merge pull request #4691 from davecheney/resource-api-move-ap… 
…iserver-common-restoreerror"

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