Modify the error message

Signed-off-by: zhouhao <zhouhao@cn.fujitsu.com>
opencontainers · Feb 13, 2017 · 0b1750c · 0b1750c
1 parent c16fa01
commit 0b1750c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/schema/fs.go b/schema/fs.go
@@ -859,6 +859,19 @@ z/m4LF/ffDcRgybcDcD5QmQIE0JaDmU55Dx4yYGgGJQBMgFH9Ikihd92maxhP9LKrVdrZjI072fRwa+z
 pl6LlqRj/iJ6azSNlw0sPeoYG9HQhLY0Yv06/j9R2XfqgJ4v7YVKea8OFdMm4BxHf577OCnF/N3tAMeK
 QhljQ3p5Fcptdbc74iAvI1efqxlQc5tcCWohB9RkKE1XzqawJlLh8XlPHiPWw1fvsP4ndcUNwGNzbN4D
 AAD//1HKEXaZAwAA
+=======
+		size:    1134,
+		modtime: 1484547392,
+		compressed: `
+H4sIAAAJbogA/6xSsW4UMRDt7ytGTjpya4KotqVKgSiIaBCFWc/uTXQeG49z4nS6f0e219nbHAUCyn3r
+9+a9eXPaACiLMkQKiTyrHtSngPzBczLEGOHBmQnho2EaURJ8DjjQSIMpr+8y/VaGHTqTqbuUQq/1k3je
+VrTzcdI2mjFt377XFbupPLKNIr3WPiAPbaoUWn2tKTvQbnZQuekYMLP99yccZixEHzAmQlE95GAAqkp8
+wSg1XIWvMz/uSGAk3FuQmhAF0g6hDIc2HKoeHKogGAHDQJxwwlhcFPG/S6bXZl/UWtarMY6Y3LNTPbxb
+MPOzYQU61z/KoSXzWJVO/+hz0bryKCkSTwuOXLx8nb8BlAlhP5+PPrDt/EBd0e+afne4f5MvSM2kb6sg
+g+eRpssUtxHHPDt7R07bVq2P3SLT6HtzxCiX9GbdxGiOq+U+JHT56f1S7Iycljx/NB3gvHJhmH0qO5D/
+0Mel2t3rrVgcZVsXnP3caIsjMZXXK+am2SwmVcQfzxTRvrSnfnee6vUttH7W697kFs+bXwEAAP///ALW
+6W4EAAA=
+>>>>>>> Modify the error message
 `,
 	},
 

diff --git a/schema/image-manifest-schema.json b/schema/image-manifest-schema.json
@@ -22,7 +22,7 @@
       }
     },
     "annotations": {
-      "id": "https://opencontainers.org/schema/image/manifest-list/annotations",
+      "id": "https://opencontainers.org/schema/image/manifest/annotations",
       "$ref": "defs-image.json#/definitions/annotations"
     }
   },

diff --git a/specs-go/v1/manifest.go b/specs-go/v1/manifest.go
@@ -27,6 +27,6 @@ type Manifest struct {
 	// Layers is an indexed list of layers referenced by the manifest.
 	Layers []Descriptor `json:"layers"`
 
-	// Annotations contains arbitrary metadata for the manifest list.
+	// Annotations contains arbitrary metadata for the image manifest.
 	Annotations map[string]string `json:"annotations,omitempty"`
 }