Merge pull request #54 from rjnagal/master

Add cAdvisor version to VersionInfo.
This commit is contained in:
Victor Marmol 2014-06-16 14:12:24 -07:00
commit 845d394755
2 changed files with 4 additions and 0 deletions

View File

@ -31,6 +31,9 @@ type VersionInfo struct {
// Docker version.
DockerVersion string `json:"docker_version"`
// cAdvisor version.
CadvisorVersion string `json:"cadvisor_version"`
}
type MachineInfoFactory interface {

View File

@ -75,6 +75,7 @@ func getVersionInfo() (*info.VersionInfo, error) {
KernelVersion: kernel_version,
ContainerOsVersion: container_os,
DockerVersion: docker_version,
CadvisorVersion: info.VERSION,
}, nil
}