docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://github.com/dotcloud/docker

This commit is contained in:
Solomon Hykes 2013-01-29 15:24:51 -08:00
parent 8c142c6127 94b1cf4be3
commit 0d9db39539
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
container.go
View File

@ -4,6 +4,7 @@ import (
"bytes" "bytes"
"encoding/json" "encoding/json"
"errors" "errors"
"github.com/kr/pty"
"io" "io"
"io/ioutil" "io/ioutil"
"log" "log"
@ -13,7 +14,6 @@ import (
"strings" "strings"
"syscall" "syscall"
"time" "time"
"github.com/kr/pty"
) )
type Container struct { type Container struct {

2
docker.go
View File

@ -117,7 +117,6 @@ func NewFromDirectory(root string) (*Docker, error) {
return docker, nil return docker, nil
} }
type History []*Container type History []*Container
func (history *History) Len() int { func (history *History) Len() int {
@ -140,4 +139,3 @@ func (history *History) Add(container *Container) {
*history = append(*history, container) *history = append(*history, container)
sort.Sort(history) sort.Sort(history)
} }