github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15755 from zhengguoyong/del_capatical_packagename_for_cadvisorApi2

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-10-18 04:04:11 -07:00
parent 80838ff86a 31c09bdcb8
commit 09a3871506
22 changed files with 224 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/mesos/pkg/executor/service/cadvisor.go
View File

@@ -19,7 +19,7 @@ package service
import (
"k8s.io/kubernetes/pkg/kubelet/cadvisor"
cadvisorApi "github.com/google/cadvisor/info/v1"
cadvisorapi "github.com/google/cadvisor/info/v1"
)
type MesosCadvisor struct {
@@ -36,7 +36,7 @@ func NewMesosCadvisor(cores int, mem int64, port uint) (*MesosCadvisor, error) {
return &MesosCadvisor{c, cores, mem}, nil
}
func (mc *MesosCadvisor) MachineInfo() (*cadvisorApi.MachineInfo, error) {
func (mc *MesosCadvisor) MachineInfo() (*cadvisorapi.MachineInfo, error) {
mi, err := mc.Interface.MachineInfo()
if err != nil {
return nil, err