Skip to content

Commit 70d2a39

Browse files
howbazaarhowbazaar
committed
Use the new juju/os repo for os and series.
1 parent 484b519 commit 70d2a39

156 files changed

Lines changed: 188 additions & 187 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎agent/agent.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616

1717
"github.com/juju/errors"
1818
"github.com/juju/loggo"
19+
"github.com/juju/os/series"
1920
"github.com/juju/utils"
20-
"github.com/juju/utils/series"
2121
"github.com/juju/utils/shell"
2222
"github.com/juju/version"
2323
"gopkg.in/juju/names.v2"

‎agent/agentbootstrap/bootstrap.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88

99
"github.com/juju/errors"
1010
"github.com/juju/loggo"
11+
"github.com/juju/os/series"
1112
"github.com/juju/utils"
1213
"github.com/juju/utils/clock"
13-
"github.com/juju/utils/series"
1414
"gopkg.in/juju/names.v2"
1515

1616
"github.com/juju/juju/agent"

‎agent/agentbootstrap/bootstrap_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import (
88
"net"
99
"path/filepath"
1010

11+
"github.com/juju/os/series"
1112
gitjujutesting "github.com/juju/testing"
1213
jc "github.com/juju/testing/checkers"
1314
"github.com/juju/utils"
1415
"github.com/juju/utils/clock"
15-
"github.com/juju/utils/series"
1616
gc "gopkg.in/check.v1"
1717
"gopkg.in/juju/names.v2"
1818

‎api/certpool.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"path/filepath"
1111

1212
"github.com/juju/errors"
13+
"github.com/juju/os/series"
1314
"github.com/juju/utils/cert"
14-
"github.com/juju/utils/series"
1515

1616
"github.com/juju/juju/juju/paths"
1717
)

‎api/imagemetadatamanager/client_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"regexp"
88

99
"github.com/juju/errors"
10+
"github.com/juju/os/series"
1011
jc "github.com/juju/testing/checkers"
11-
"github.com/juju/utils/series"
1212
gc "gopkg.in/check.v1"
1313

1414
"github.com/juju/juju/api/base/testing"

‎api/provisioner/provisioner_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ import (
1313
"time"
1414

1515
"github.com/juju/errors"
16+
"github.com/juju/os/series"
1617
gitjujutesting "github.com/juju/testing"
1718
jc "github.com/juju/testing/checkers"
1819
"github.com/juju/utils"
1920
"github.com/juju/utils/arch"
20-
"github.com/juju/utils/series"
2121
"github.com/juju/version"
2222
gc "gopkg.in/check.v1"
2323
"gopkg.in/juju/names.v2"

‎api/upgrader/unitupgrader_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ package upgrader_test
55

66
import (
77
"github.com/juju/errors"
8+
"github.com/juju/os/series"
89
jc "github.com/juju/testing/checkers"
910
"github.com/juju/utils"
1011
"github.com/juju/utils/arch"
11-
"github.com/juju/utils/series"
1212
"github.com/juju/version"
1313
gc "gopkg.in/check.v1"
1414

‎apiserver/common/tools_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"fmt"
88

99
"github.com/juju/errors"
10+
"github.com/juju/os/series"
1011
jc "github.com/juju/testing/checkers"
1112
"github.com/juju/utils/arch"
12-
"github.com/juju/utils/series"
1313
"github.com/juju/version"
1414
gc "gopkg.in/check.v1"
1515
"gopkg.in/juju/names.v2"

‎apiserver/facades/agent/provisioner/provisioninginfo.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
"github.com/juju/collections/set"
1212
"github.com/juju/errors"
13-
"github.com/juju/utils/series"
13+
"github.com/juju/os/series"
1414
"gopkg.in/juju/names.v2"
1515

1616
"github.com/juju/juju/apiserver/common"

‎apiserver/facades/agent/upgrader/unitupgrader_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ package upgrader_test
55

66
import (
77
"github.com/juju/errors"
8+
"github.com/juju/os/series"
89
jc "github.com/juju/testing/checkers"
910
"github.com/juju/utils/arch"
10-
"github.com/juju/utils/series"
1111
"github.com/juju/version"
1212
gc "gopkg.in/check.v1"
1313
"gopkg.in/juju/names.v2"

0 commit comments

Comments
 (0)