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

2013-01-29 15:24:51 -08:00 · 2013-01-29 15:24:51 -08:00 · 0d9db39539
parent 8c142c6127 94b1cf4be3
commit 0d9db39539
2 changed files with 7 additions and 9 deletions
--- a/container.go
+++ b/container.go
@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
+	"github.com/kr/pty"
 	"io"
 	"io/ioutil"
 	"log"
@ -13,7 +14,6 @@ import (
 	"strings"
 	"syscall"
 	"time"
-	"github.com/kr/pty"
 )

 type Container struct {
--- a/docker.go
+++ b/docker.go
@ -117,7 +117,6 @@ func NewFromDirectory(root string) (*Docker, error) {
 	return docker, nil
 }

-
 type History []*Container

 func (history *History) Len() int {
@ -140,4 +139,3 @@ func (history *History) Add(container *Container) {
 	*history = append(*history, container)
 	sort.Sort(history)
 }
-