Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

Commit

Permalink
Rename "v1" to "statsV1"
Browse files Browse the repository at this point in the history
follow-up to 27552ce, where this
was left as a review comment, but the PR was already merged.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 9a7e96b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
  • Loading branch information
thaJeztah committed Dec 3, 2019
1 parent 9ab162a commit 4d190af
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions daemon/daemon_unix.go
Expand Up @@ -16,7 +16,7 @@ import (
"strings"
"time"

v1 "github.com/containerd/cgroups/stats/v1"
statsV1 "github.com/containerd/cgroups/stats/v1"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/blkiodev"
pblkiodev "github.com/docker/docker/api/types/blkiodev"
Expand Down Expand Up @@ -1347,7 +1347,7 @@ func (daemon *Daemon) conditionalUnmountOnCleanup(container *container.Container
return daemon.Unmount(container)
}

func copyBlkioEntry(entries []*v1.BlkIOEntry) []types.BlkioStatEntry {
func copyBlkioEntry(entries []*statsV1.BlkIOEntry) []types.BlkioStatEntry {
out := make([]types.BlkioStatEntry, len(entries))
for i, re := range entries {
out[i] = types.BlkioStatEntry{
Expand Down
6 changes: 3 additions & 3 deletions libcontainerd/types/types_linux.go
Expand Up @@ -3,7 +3,7 @@ package types // import "github.com/docker/docker/libcontainerd/types"
import (
"time"

v1 "github.com/containerd/cgroups/stats/v1"
statsV1 "github.com/containerd/cgroups/stats/v1"
specs "github.com/opencontainers/runtime-spec/specs-go"
)

Expand All @@ -13,13 +13,13 @@ type Summary struct{}
// Stats holds metrics properties as returned by containerd
type Stats struct {
Read time.Time
Metrics *v1.Metrics
Metrics *statsV1.Metrics
}

// InterfaceToStats returns a stats object from the platform-specific interface.
func InterfaceToStats(read time.Time, v interface{}) *Stats {
return &Stats{
Metrics: v.(*v1.Metrics),
Metrics: v.(*statsV1.Metrics),
Read: read,
}
}
Expand Down

0 comments on commit 4d190af

Please sign in to comment.