Skip to content

Commit

Permalink
Merge 2.3 branch
Browse files Browse the repository at this point in the history
  • Loading branch information
@howbazaar
howbazaar committed May 24, 2018
2 parents 39949a6 + 2918193 commit ecd8d82
Show file tree
Hide file tree
Showing 152 changed files with 184 additions and 183 deletions.
2 changes: 1 addition & 1 deletion agent/agent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (

"github.com/juju/errors"
"github.com/juju/loggo"
"github.com/juju/os/series"
"github.com/juju/utils"
"github.com/juju/utils/series"
"github.com/juju/utils/shell"
"github.com/juju/version"
"gopkg.in/juju/names.v2"
Expand Down
2 changes: 1 addition & 1 deletion agent/agentbootstrap/bootstrap.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
coreraft "github.com/hashicorp/raft"
"github.com/juju/errors"
"github.com/juju/loggo"
"github.com/juju/os/series"
"github.com/juju/utils"
"github.com/juju/utils/clock"
"github.com/juju/utils/series"
"gopkg.in/juju/names.v2"
"gopkg.in/mgo.v2"

Expand Down
2 changes: 1 addition & 1 deletion agent/agentbootstrap/bootstrap_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"net"
"path/filepath"

"github.com/juju/os/series"
gitjujutesting "github.com/juju/testing"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
"github.com/juju/utils/series"
gc "gopkg.in/check.v1"
"gopkg.in/juju/names.v2"

Expand Down
2 changes: 1 addition & 1 deletion agent/tools/symlinks_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"path/filepath"
"time"

"github.com/juju/os/series"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
"github.com/juju/utils/arch"
"github.com/juju/utils/series"
"github.com/juju/utils/symlink"
"github.com/juju/version"
gc "gopkg.in/check.v1"
Expand Down
2 changes: 1 addition & 1 deletion api/certpool.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"path/filepath"

"github.com/juju/errors"
"github.com/juju/os/series"
"github.com/juju/utils/cert"
"github.com/juju/utils/series"

"github.com/juju/juju/juju/paths"
)
Expand Down
2 changes: 1 addition & 1 deletion api/imagemetadatamanager/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"regexp"

"github.com/juju/errors"
"github.com/juju/os/series"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils/series"
gc "gopkg.in/check.v1"

"github.com/juju/juju/api/base/testing"
Expand Down
2 changes: 1 addition & 1 deletion api/provisioner/provisioner_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"time"

"github.com/juju/errors"
"github.com/juju/os/series"
gitjujutesting "github.com/juju/testing"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
"github.com/juju/utils/arch"
"github.com/juju/utils/series"
"github.com/juju/version"
gc "gopkg.in/check.v1"
"gopkg.in/juju/names.v2"
Expand Down
2 changes: 1 addition & 1 deletion api/upgrader/unitupgrader_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ package upgrader_test

import (
"github.com/juju/errors"
"github.com/juju/os/series"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
"github.com/juju/utils/arch"
"github.com/juju/utils/series"
"github.com/juju/version"
gc "gopkg.in/check.v1"

Expand Down
2 changes: 1 addition & 1 deletion apiserver/common/tools_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"fmt"

"github.com/juju/errors"
"github.com/juju/os/series"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils/arch"
"github.com/juju/utils/series"
"github.com/juju/version"
gc "gopkg.in/check.v1"
"gopkg.in/juju/names.v2"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/agent/provisioner/provisioninginfo.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"github.com/juju/collections/set"
"github.com/juju/errors"
"github.com/juju/utils/series"
"github.com/juju/os/series"
"gopkg.in/juju/names.v2"

"github.com/juju/juju/apiserver/common"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/agent/upgrader/unitupgrader_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ package upgrader_test

import (
"github.com/juju/errors"
"github.com/juju/os/series"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils/arch"
"github.com/juju/utils/series"
"github.com/juju/version"
gc "gopkg.in/check.v1"
"gopkg.in/juju/names.v2"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/agent/upgrader/upgrader_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"fmt"

"github.com/juju/errors"
"github.com/juju/os/series"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils/arch"
"github.com/juju/utils/series"
"github.com/juju/version"
gc "gopkg.in/check.v1"
"gopkg.in/juju/names.v2"
Expand Down
4 changes: 2 additions & 2 deletions apiserver/facades/client/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (

"github.com/juju/errors"
"github.com/juju/loggo"
"github.com/juju/utils/os"
"github.com/juju/utils/series"
"github.com/juju/os"
"github.com/juju/os/series"
"gopkg.in/juju/names.v2"

"github.com/juju/juju/apiserver/common"
Expand Down
4 changes: 2 additions & 2 deletions apiserver/facades/controller/metricsmanager/metricsmanager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (

"github.com/juju/errors"
"github.com/juju/loggo"
"github.com/juju/os"
"github.com/juju/os/series"
"github.com/juju/utils"
"github.com/juju/utils/clock"
"github.com/juju/utils/os"
"github.com/juju/utils/series"
"gopkg.in/juju/names.v2"

"github.com/juju/juju/apiserver/common"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/tools_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ import (
"strings"

"github.com/juju/errors"
"github.com/juju/os/series"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
"github.com/juju/utils/arch"
"github.com/juju/utils/series"
"github.com/juju/version"
gc "gopkg.in/check.v1"

Expand Down
4 changes: 2 additions & 2 deletions cloudconfig/cloudinit/interface.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ package cloudinit

import (
"github.com/juju/errors"
"github.com/juju/os"
"github.com/juju/os/series"
"github.com/juju/packaging"
"github.com/juju/packaging/commands"
"github.com/juju/packaging/config"
"github.com/juju/proxy"
"github.com/juju/utils/os"
"github.com/juju/utils/series"
"github.com/juju/utils/shell"

"github.com/juju/juju/network"
Expand Down
4 changes: 2 additions & 2 deletions cloudconfig/machinecloudconfig.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (

"github.com/juju/errors"
"github.com/juju/loggo"
utilsos "github.com/juju/os"
utilsseries "github.com/juju/os/series"
"github.com/juju/utils"
utilsos "github.com/juju/utils/os"
utilsseries "github.com/juju/utils/series"
"gopkg.in/yaml.v2"

"github.com/juju/juju/juju/paths"
Expand Down
2 changes: 1 addition & 1 deletion cloudconfig/machinecloudconfig_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/juju/errors"
"github.com/juju/loggo"
utilsseries "github.com/juju/utils/series"
utilsseries "github.com/juju/os/series"
gc "gopkg.in/check.v1"

"github.com/juju/juju/cloudconfig"
Expand Down
2 changes: 1 addition & 1 deletion cloudconfig/providerinit/providerinit.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package providerinit
import (
"github.com/juju/errors"
"github.com/juju/loggo"
"github.com/juju/utils/series"
"github.com/juju/os/series"

"github.com/juju/juju/cloudconfig"
"github.com/juju/juju/cloudconfig/cloudinit"
Expand Down
2 changes: 1 addition & 1 deletion cloudconfig/providerinit/renderers/interface.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
package renderers

import (
"github.com/juju/utils/os"
"github.com/juju/os"

"github.com/juju/juju/cloudconfig/cloudinit"
)
Expand Down
4 changes: 2 additions & 2 deletions cloudconfig/userdatacfg.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"fmt"

"github.com/juju/errors"
"github.com/juju/os"
"github.com/juju/os/series"
"github.com/juju/utils"
"github.com/juju/utils/os"
"github.com/juju/utils/series"
"gopkg.in/juju/names.v2"

"github.com/juju/juju/agent"
Expand Down
2 changes: 1 addition & 1 deletion cloudconfig/userdatacfg_unix.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (

"github.com/juju/errors"
"github.com/juju/loggo"
"github.com/juju/os"
"github.com/juju/utils/featureflag"
"github.com/juju/utils/os"
"github.com/juju/version"
"gopkg.in/juju/names.v2"

Expand Down
2 changes: 1 addition & 1 deletion cloudconfig/userdatacfg_win.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"strings"

"github.com/juju/errors"
"github.com/juju/os/series"
"github.com/juju/utils/cert"
"github.com/juju/utils/featureflag"
"github.com/juju/utils/series"
"gopkg.in/juju/names.v2"

"github.com/juju/juju/juju/osenv"
Expand Down
2 changes: 1 addition & 1 deletion cmd/juju/application/series_selector_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
package application

import (
"github.com/juju/os/series"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils/series"
gc "gopkg.in/check.v1"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/juju/commands/bootstrap_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ import (
"github.com/juju/cmd/cmdtesting"
"github.com/juju/errors"
"github.com/juju/loggo"
jujuos "github.com/juju/os"
"github.com/juju/os/series"
"github.com/juju/testing"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
"github.com/juju/utils/arch"
jujuos "github.com/juju/utils/os"
"github.com/juju/utils/series"
"github.com/juju/version"
gc "gopkg.in/check.v1"

Expand Down
4 changes: 2 additions & 2 deletions cmd/juju/commands/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import (
"github.com/juju/cmd"
"github.com/juju/errors"
"github.com/juju/loggo"
utilsos "github.com/juju/os"
"github.com/juju/os/series"
proxyutils "github.com/juju/proxy"
"github.com/juju/utils/featureflag"
utilsos "github.com/juju/utils/os"
"github.com/juju/utils/series"
"github.com/juju/version"

// Import the providers.
Expand Down
4 changes: 2 additions & 2 deletions cmd/juju/commands/main_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@ import (
"github.com/juju/cmd"
"github.com/juju/cmd/cmdtesting"
"github.com/juju/collections/set"
"github.com/juju/juju/jujuclient/jujuclienttesting"
"github.com/juju/os/series"
gitjujutesting "github.com/juju/testing"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils/arch"
"github.com/juju/utils/featureflag"
"github.com/juju/utils/series"
"github.com/juju/version"
gc "gopkg.in/check.v1"

"github.com/juju/juju/cmd/juju/application"
"github.com/juju/juju/cmd/juju/cloud"
"github.com/juju/juju/cmd/modelcmd"
"github.com/juju/juju/juju/osenv"
"github.com/juju/juju/jujuclient/jujuclienttesting"
_ "github.com/juju/juju/provider/dummy"
"github.com/juju/juju/testing"
jujuversion "github.com/juju/juju/version"
Expand Down
2 changes: 1 addition & 1 deletion cmd/juju/commands/synctools_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
"github.com/juju/cmd/cmdtesting"
"github.com/juju/errors"
"github.com/juju/loggo"
"github.com/juju/os/series"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
"github.com/juju/utils/arch"
"github.com/juju/utils/series"
"github.com/juju/version"
gc "gopkg.in/check.v1"

Expand Down
2 changes: 1 addition & 1 deletion cmd/juju/commands/upgrademodel.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/juju/cmd"
"github.com/juju/errors"
"github.com/juju/gnuflag"
"github.com/juju/utils/series"
"github.com/juju/os/series"
"github.com/juju/version"

"github.com/juju/juju/api/controller"
Expand Down
2 changes: 1 addition & 1 deletion cmd/juju/commands/upgrademodel_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"github.com/juju/cmd"
"github.com/juju/cmd/cmdtesting"
"github.com/juju/errors"
"github.com/juju/os/series"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils/arch"
"github.com/juju/utils/series"
"github.com/juju/version"
gc "gopkg.in/check.v1"

Expand Down
4 changes: 2 additions & 2 deletions cmd/juju/status/formatter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"fmt"
"strings"

"github.com/juju/utils/os"
"github.com/juju/utils/series"
"github.com/juju/os"
"github.com/juju/os/series"
"gopkg.in/juju/charm.v6"
"gopkg.in/juju/names.v2"

Expand Down
2 changes: 1 addition & 1 deletion cmd/jujud/agent/agent_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"github.com/juju/cmd"
"github.com/juju/cmd/cmdtesting"
"github.com/juju/loggo"
"github.com/juju/os/series"
"github.com/juju/testing"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils/series"
gc "gopkg.in/check.v1"
worker "gopkg.in/juju/worker.v1"

Expand Down
2 changes: 1 addition & 1 deletion cmd/jujud/agent/agenttest/agent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import (
"github.com/juju/cmd"
"github.com/juju/cmd/cmdtesting"
"github.com/juju/errors"
"github.com/juju/os/series"
"github.com/juju/replicaset"
gitjujutesting "github.com/juju/testing"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils/arch"
"github.com/juju/utils/clock"
"github.com/juju/utils/series"
"github.com/juju/version"
gc "gopkg.in/check.v1"
"gopkg.in/juju/names.v2"
Expand Down
2 changes: 1 addition & 1 deletion cmd/jujud/agent/machine.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ import (
"github.com/juju/errors"
"github.com/juju/gnuflag"
"github.com/juju/loggo"
"github.com/juju/os/series"
"github.com/juju/pubsub"
"github.com/juju/replicaset"
"github.com/juju/utils"
utilscert "github.com/juju/utils/cert"
"github.com/juju/utils/clock"
"github.com/juju/utils/series"
"github.com/juju/utils/symlink"
"github.com/juju/utils/voyeur"
"github.com/juju/version"
Expand Down
Loading

0 comments on commit ecd8d82

Please sign in to comment.