Skip to content

Commit

Permalink
Switch to charm.v6-unstable.
Browse files Browse the repository at this point in the history
  • Loading branch information
ericsnowcurrently committed Nov 4, 2015
1 parent 3586c80 commit 4044f05
Show file tree
Hide file tree
Showing 20 changed files with 20 additions and 21 deletions.
3 changes: 1 addition & 2 deletions dependencies.tsv
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ gopkg.in/amz.v3 git bff3a097c4108da57bb8cbe3aad2990d74d23676 2015-08-20T12:28:33
gopkg.in/check.v1 git b3d3430320d4260e5fea99841af984b3badcea63 2015-06-26T10:50:28Z
gopkg.in/errgo.v1 git 66cb46252b94c1f3d65646f54ee8043ab38d766c 2015-10-07T15:31:57Z
gopkg.in/goose.v1 git be6030ce33a6d77f5e9c63b7698030e6431d5343 2015-08-24T15:19:40Z
gopkg.in/juju/charm.v5 git aece7b0e56c298641968239a7fa0b3466afa6ef5 2015-10-08T18:29:44Z
gopkg.in/juju/charm.v6-unstable git df4f3d493649ae0abf547e87a1149b4db713ddb1 2015-10-05T09:54:00Z
gopkg.in/juju/charm.v6-unstable git 0c23b5a82a3878b2f8538f45806968a2a93effc3 2015-10-08T18:38:33Z
gopkg.in/juju/charmrepo.v1 git 8677b12d9772a2a596a99e65b7e6f642fceb6c40 2015-09-14T13:26:00Z
gopkg.in/juju/charmstore.v5-unstable git 475920bf612769da77969237ed511a921fb785be 2015-09-16T09:44:01Z
gopkg.in/juju/environschema.v1 git 7bea6a9a531586600a7741e9bdd5e3c978ffda15 2015-10-20T16:12:31Z
Expand Down
2 changes: 1 addition & 1 deletion payload/api/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package api
import (
"github.com/juju/errors"
"github.com/juju/names"
"gopkg.in/juju/charm.v5"
"gopkg.in/juju/charm.v6-unstable"

"github.com/juju/juju/payload"
)
Expand Down
2 changes: 1 addition & 1 deletion payload/api/helpers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/juju/testing"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v5"
"gopkg.in/juju/charm.v6-unstable"

"github.com/juju/juju/payload"
)
Expand Down
2 changes: 1 addition & 1 deletion payload/api/internal/helpers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/juju/testing"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v5"
"gopkg.in/juju/charm.v6-unstable"

"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/params"
Expand Down
2 changes: 1 addition & 1 deletion payload/api/internal/server/unitfacade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/juju/testing"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v5"
"gopkg.in/juju/charm.v6-unstable"

"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/params"
Expand Down
2 changes: 1 addition & 1 deletion payload/api/server/public_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/juju/testing"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v5"
"gopkg.in/juju/charm.v6-unstable"

"github.com/juju/juju/payload"
"github.com/juju/juju/payload/api"
Expand Down
2 changes: 1 addition & 1 deletion payload/context/base_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/juju/errors"
"github.com/juju/testing"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v5"
"gopkg.in/juju/charm.v6-unstable"

components "github.com/juju/juju/component/all"
"github.com/juju/juju/payload"
Expand Down
2 changes: 1 addition & 1 deletion payload/context/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package context
import (
"github.com/juju/cmd"
"github.com/juju/errors"
"gopkg.in/juju/charm.v5"
"gopkg.in/juju/charm.v6-unstable"

"github.com/juju/juju/payload"
)
Expand Down
2 changes: 1 addition & 1 deletion payload/context/register_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/juju/testing"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v5"
"gopkg.in/juju/charm.v6-unstable"

"github.com/juju/juju/payload"
)
Expand Down
2 changes: 1 addition & 1 deletion payload/context/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/juju/cmd"
"github.com/juju/errors"
"gopkg.in/juju/charm.v5"
"gopkg.in/juju/charm.v6-unstable"
)

func readMetadata(ctx *cmd.Context) (*charm.Meta, error) {
Expand Down
2 changes: 1 addition & 1 deletion payload/filter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/juju/testing"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v5"
"gopkg.in/juju/charm.v6-unstable"

"github.com/juju/juju/payload"
)
Expand Down
2 changes: 1 addition & 1 deletion payload/payload.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package payload

import (
"github.com/juju/errors"
"gopkg.in/juju/charm.v5"
"gopkg.in/juju/charm.v6-unstable"
)

// Payload holds information about a charm payload.
Expand Down
2 changes: 1 addition & 1 deletion payload/payload_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/juju/testing"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v5"
"gopkg.in/juju/charm.v6-unstable"

"github.com/juju/juju/payload"
)
Expand Down
2 changes: 1 addition & 1 deletion payload/persistence/base_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
gitjujutesting "github.com/juju/testing"
"github.com/juju/utils"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v5"
"gopkg.in/juju/charm.v6-unstable"

"github.com/juju/juju/payload"
"github.com/juju/juju/testing"
Expand Down
2 changes: 1 addition & 1 deletion payload/persistence/env_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/juju/testing"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v5"
"gopkg.in/juju/charm.v6-unstable"

"github.com/juju/juju/payload"
)
Expand Down
2 changes: 1 addition & 1 deletion payload/persistence/mongo.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/juju/errors"
"github.com/juju/names"
"gopkg.in/juju/charm.v5"
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/mgo.v2/bson"
"gopkg.in/mgo.v2/txn"

Expand Down
2 changes: 1 addition & 1 deletion payload/state/base_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v5"
"gopkg.in/juju/charm.v6-unstable"

"github.com/juju/juju/payload"
"github.com/juju/juju/testing"
Expand Down
2 changes: 1 addition & 1 deletion payload/state/payloads_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/juju/testing"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v5"
"gopkg.in/juju/charm.v6-unstable"

"github.com/juju/juju/payload"
"github.com/juju/juju/payload/state"
Expand Down
2 changes: 1 addition & 1 deletion payload/status/util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package status
import (
"fmt"

"gopkg.in/juju/charm.v5"
"gopkg.in/juju/charm.v6-unstable"

"github.com/juju/juju/payload"
)
Expand Down
2 changes: 1 addition & 1 deletion state/payloads_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/juju/errors"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v5"
"gopkg.in/juju/charm.v6-unstable"

"github.com/juju/juju/component/all"
"github.com/juju/juju/payload"
Expand Down

0 comments on commit 4044f05

Please sign in to comment.