Skip to content

Commit

Permalink
Use juju/clock not juju/utils/clock.
Browse files Browse the repository at this point in the history
  • Loading branch information
@howbazaar
howbazaar committed Aug 19, 2018
1 parent 23c4b4f commit 7df4722
Show file tree
Hide file tree
Showing 225 changed files with 225 additions and 225 deletions.
2 changes: 1 addition & 1 deletion Gopkg.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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

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

Expand Down
2 changes: 1 addition & 1 deletion api/apiclient.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import (
"time"

"github.com/gorilla/websocket"
"github.com/juju/clock"
"github.com/juju/errors"
"github.com/juju/loggo"
"github.com/juju/utils"
"github.com/juju/utils/clock"
"github.com/juju/utils/parallel"
"github.com/juju/version"
"gopkg.in/juju/names.v2"
Expand Down
2 changes: 1 addition & 1 deletion api/apiclient_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ import (
"sync/atomic"
"time"

"github.com/juju/clock"
"github.com/juju/errors"
proxyutils "github.com/juju/proxy"
"github.com/juju/testing"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils/clock"
gc "gopkg.in/check.v1"
"gopkg.in/juju/names.v2"

Expand Down
2 changes: 1 addition & 1 deletion api/crossmodelrelations/crossmodelrelations.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
package crossmodelrelations

import (
"github.com/juju/clock"
"github.com/juju/errors"
"github.com/juju/loggo"
"github.com/juju/utils/clock"
"gopkg.in/macaroon.v2-unstable"

"github.com/juju/juju/api/base"
Expand Down
2 changes: 1 addition & 1 deletion api/crossmodelrelations/crossmodelrelations_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"bytes"
"encoding/json"

"github.com/juju/clock"
"github.com/juju/errors"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils/clock"
gc "gopkg.in/check.v1"
"gopkg.in/macaroon.v2-unstable"

Expand Down
2 changes: 1 addition & 1 deletion api/crossmodelrelations/macarooncache.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"sync"
"time"

"github.com/juju/utils/clock"
"github.com/juju/clock"
"gopkg.in/macaroon-bakery.v2-unstable/bakery/checkers"
"gopkg.in/macaroon.v2-unstable"
)
Expand Down
2 changes: 1 addition & 1 deletion api/export_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"context"
"net/url"

"github.com/juju/clock"
"github.com/juju/errors"
"github.com/juju/utils/clock"
"gopkg.in/juju/names.v2"
"gopkg.in/macaroon-bakery.v2-unstable/httpbakery"
"gopkg.in/macaroon.v2-unstable"
Expand Down
2 changes: 1 addition & 1 deletion api/interface.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"net/url"
"time"

"github.com/juju/clock"
"github.com/juju/collections/set"
"github.com/juju/errors"
"github.com/juju/utils/clock"
"github.com/juju/version"
"gopkg.in/juju/names.v2"
"gopkg.in/macaroon-bakery.v2-unstable/httpbakery"
Expand Down
2 changes: 1 addition & 1 deletion api/monitor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package api
import (
"time"

"github.com/juju/utils/clock"
"github.com/juju/clock"
)

// monitor performs regular pings of an API connection as well as
Expand Down
2 changes: 1 addition & 1 deletion apiserver/admin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"sync/atomic"
"time"

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

"github.com/juju/juju/api"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/apiserver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ import (
"sync/atomic"
"time"

"github.com/juju/clock"
"github.com/juju/errors"
"github.com/juju/loggo"
"github.com/juju/pubsub"
"github.com/juju/utils"
"github.com/juju/utils/clock"
"github.com/prometheus/client_golang/prometheus"
"gopkg.in/juju/names.v2"
"gopkg.in/juju/worker.v1/dependency"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/apiserver_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import (
"net/url"

"github.com/gorilla/websocket"
"github.com/juju/clock"
"github.com/juju/loggo"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
"github.com/juju/utils/clock"
gc "gopkg.in/check.v1"
"gopkg.in/juju/names.v2"
"gopkg.in/juju/worker.v1/dependency"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/authentication/user.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"net/http"
"time"

"github.com/juju/clock"
"github.com/juju/errors"
"github.com/juju/loggo"
"github.com/juju/utils/clock"
"gopkg.in/juju/names.v2"
"gopkg.in/macaroon-bakery.v2-unstable/bakery"
"gopkg.in/macaroon-bakery.v2-unstable/bakery/checkers"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/common/crossmodel/auth.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package crossmodel
import (
"time"

"github.com/juju/clock"
"github.com/juju/errors"
"github.com/juju/utils/clock"
"gopkg.in/errgo.v1"
"gopkg.in/juju/names.v2"
"gopkg.in/macaroon-bakery.v2-unstable/bakery"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/common/modeldestroy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
package common

import (
"github.com/juju/clock"
"github.com/juju/errors"
"github.com/juju/utils/clock"

"github.com/juju/juju/apiserver/facades/agent/metricsender"
"github.com/juju/juju/state"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/export_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
package apiserver

import (
"github.com/juju/clock"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils/clock"
gc "gopkg.in/check.v1"
"gopkg.in/juju/names.v2"

Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/agent/metricsender/metricsender.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
package metricsender

import (
"github.com/juju/clock"
"github.com/juju/errors"
"github.com/juju/loggo"
wireformat "github.com/juju/romulus/wireformat/metrics"
"github.com/juju/utils/clock"

"github.com/juju/juju/state"
)
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/agent/metricsender/metricsender_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"errors"
"time"

"github.com/juju/clock"
wireformat "github.com/juju/romulus/wireformat/metrics"
jujutesting "github.com/juju/testing"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils/clock"
gc "gopkg.in/check.v1"

"github.com/juju/juju/apiserver/facades/agent/metricsender"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/agent/metricsender/sender_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"net/http/httptest"
"time"

"github.com/juju/clock"
wireformat "github.com/juju/romulus/wireformat/metrics"
jujutesting "github.com/juju/testing"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
"github.com/juju/utils/clock"
gc "gopkg.in/check.v1"

"github.com/juju/juju/apiserver/facades/agent/metricsender"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/agent/presence/pinger.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"fmt"
"time"

"github.com/juju/clock"
"github.com/juju/errors"
"github.com/juju/loggo"
"github.com/juju/utils/clock"
"gopkg.in/juju/names.v2"
"gopkg.in/juju/worker.v1"
"gopkg.in/juju/worker.v1/catacomb"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/agent/presence/util_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"sync"
"time"

"github.com/juju/clock"
"github.com/juju/errors"
"github.com/juju/testing"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils/clock"
gc "gopkg.in/check.v1"
"gopkg.in/juju/names.v2"
"gopkg.in/juju/worker.v1"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/controller/caasunitprovisioner/provisioner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ package caasunitprovisioner
import (
"sort"

"github.com/juju/clock"
"github.com/juju/collections/set"
"github.com/juju/errors"
"github.com/juju/loggo"
"github.com/juju/utils/clock"
"gopkg.in/juju/names.v2"

"github.com/juju/juju/apiserver/common"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/controller/caasunitprovisioner/provisioner_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ package caasunitprovisioner_test
import (
"time"

"github.com/juju/clock"
"github.com/juju/testing"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils/clock"
gc "gopkg.in/check.v1"
"gopkg.in/juju/names.v2"
"gopkg.in/juju/worker.v1/workertest"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/controller/instancepoller/instancepoller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package instancepoller
import (
"fmt"

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

"github.com/juju/juju/apiserver/common"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/controller/instancepoller/instancepoller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ package instancepoller_test
import (
"time"

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

"github.com/juju/juju/apiserver/common"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/controller/metricsmanager/metricsmanager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (
"fmt"
"strings"

"github.com/juju/clock"
"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"
"gopkg.in/juju/names.v2"

"github.com/juju/juju/apiserver/common"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/listener.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"sync"
"time"

"github.com/juju/utils/clock"
"github.com/juju/clock"
)

func newThrottlingListener(inner net.Listener, cfg RateLimitConfig, clk clock.Clock) net.Listener {
Expand Down
2 changes: 1 addition & 1 deletion apiserver/logsink.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"sync"
"time"

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

Expand Down
2 changes: 1 addition & 1 deletion apiserver/logsink/logsink.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"time"

gorillaws "github.com/gorilla/websocket"
"github.com/juju/clock"
"github.com/juju/errors"
"github.com/juju/loggo"
"github.com/juju/ratelimit"
"github.com/juju/utils/clock"
"github.com/juju/utils/featureflag"
"github.com/juju/version"

Expand Down
2 changes: 1 addition & 1 deletion apiserver/logstream.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"time"

"github.com/gorilla/schema"
"github.com/juju/clock"
"github.com/juju/errors"
"github.com/juju/utils/clock"
"github.com/juju/utils/featureflag"

"github.com/juju/juju/apiserver/params"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/logstream_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import (

"github.com/google/go-querystring/query"
gorillaws "github.com/gorilla/websocket"
"github.com/juju/clock"
"github.com/juju/errors"
"github.com/juju/loggo"
"github.com/juju/testing"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils/clock"
gc "gopkg.in/check.v1"
"gopkg.in/juju/names.v2"

Expand Down
2 changes: 1 addition & 1 deletion apiserver/observer/metricobserver/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
package metricobserver_test

import (
"github.com/juju/clock"
"github.com/juju/testing"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils/clock"
"github.com/prometheus/client_golang/prometheus"
gc "gopkg.in/check.v1"

Expand Down
2 changes: 1 addition & 1 deletion apiserver/observer/metricobserver/metricobserver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"strconv"
"time"

"github.com/juju/clock"
"github.com/juju/errors"
"github.com/juju/utils/clock"
"github.com/prometheus/client_golang/prometheus"
"gopkg.in/juju/names.v2"

Expand Down
2 changes: 1 addition & 1 deletion apiserver/observer/request_notifier.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"net/http"
"time"

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

"github.com/juju/juju/pubsub/apiserver"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/pinger.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package apiserver
import (
"time"

"github.com/juju/clock"
"github.com/juju/errors"
"github.com/juju/utils/clock"
"gopkg.in/tomb.v2"

"github.com/juju/juju/apiserver/facade"
Expand Down
Loading

0 comments on commit 7df4722

Please sign in to comment.