@@ -611,11 +611,11 @@ type JSONMessage struct {

 	Status   string `json:"status,omitempty"`

 	Progress string `json:"progress,omitempty"`

 	Error    string `json:"error,omitempty"`

-	ID	 string `json:"id,omitempty"`

-	Time	 int64 `json:"time,omitempty"`

+	ID       string `json:"id,omitempty"`

+	Time     int64  `json:"time,omitempty"`

 }

-func (jm *JSONMessage) Display(out io.Writer) (error) {

+func (jm *JSONMessage) Display(out io.Writer) error {

 	if jm.Time != 0 {

 		fmt.Fprintf(out, "[%s] ", time.Unix(jm.Time, 0))

 	}

@@ -631,7 +631,6 @@ func (jm *JSONMessage) Display(out io.Writer) (error) {

 	return nil

 }

-

 type StreamFormatter struct {

 	json bool

 	used bool

@@ -282,3 +282,24 @@ func TestParseHost(t *testing.T) {

 		t.Errorf("unix:///var/run/docker.sock -> expected unix:///var/run/docker.sock, got %s", addr)

 	}

 }

+

+func TestParseRepositoryTag(t *testing.T) {

+	if repo, tag := ParseRepositoryTag("root"); repo != "root" || tag != "" {

+		t.Errorf("Expected repo: '%s' and tag: '%s', got '%s' and '%s'", "root", "", repo, tag)

+	}

+	if repo, tag := ParseRepositoryTag("root:tag"); repo != "root" || tag != "tag" {

+		t.Errorf("Expected repo: '%s' and tag: '%s', got '%s' and '%s'", "root", "tag", repo, tag)

+	}

+	if repo, tag := ParseRepositoryTag("user/repo"); repo != "user/repo" || tag != "" {

+		t.Errorf("Expected repo: '%s' and tag: '%s', got '%s' and '%s'", "user/repo", "", repo, tag)

+	}

+	if repo, tag := ParseRepositoryTag("user/repo:tag"); repo != "user/repo" || tag != "tag" {

+		t.Errorf("Expected repo: '%s' and tag: '%s', got '%s' and '%s'", "user/repo", "tag", repo, tag)

+	}

+	if repo, tag := ParseRepositoryTag("url:5000/repo"); repo != "url:5000/repo" || tag != "" {

+		t.Errorf("Expected repo: '%s' and tag: '%s', got '%s' and '%s'", "url:5000/repo", "", repo, tag)

+	}

+	if repo, tag := ParseRepositoryTag("url:5000/repo:tag"); repo != "url:5000/repo" || tag != "tag" {

+		t.Errorf("Expected repo: '%s' and tag: '%s', got '%s' and '%s'", "url:5000/repo", "tag", repo, tag)

+	}

+}