Merge commit '5f8aae8efc5a92c4b5f8c631f51c8b04a7141ea3'

Julian · Julian · commit 11dd8a53a856 · 2013-10-27T15:28:46.000-04:00
* commit '5f8aae8efc5a92c4b5f8c631f51c8b04a7141ea3': Squashed 'json/' changes from b6f129e..468fa78
diff --git a/json/tests/draft3/optional/format.json b/json/tests/draft3/optional/format.json
@@ -81,6 +81,11 @@
                 "description": "an invalid URI",
                 "data": "\\\\WINDOWS\\fileshare",
                 "valid": false
+            },
+            {
+                "description": "an invalid URI though valid URI reference",
+                "data": "abc",
+                "valid": false
             }
         ]
     },
diff --git a/json/tests/draft4/optional/format.json b/json/tests/draft4/optional/format.json
@@ -33,6 +33,11 @@
                 "description": "an invalid URI",
                 "data": "\\\\WINDOWS\\fileshare",
                 "valid": false
+            },
+            {
+                "description": "an invalid URI though valid URI reference",
+                "data": "abc",
+                "valid": false
             }
         ]
     },

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,11 @@`
`81`	`81`	`"description": "an invalid URI",`
`82`	`82`	`"data": "\\\\WINDOWS\\fileshare",`
`83`	`83`	`"valid": false`
	`84`	`+ },`
	`85`	`+ {`
	`86`	`+ "description": "an invalid URI though valid URI reference",`
	`87`	`+ "data": "abc",`
	`88`	`+ "valid": false`
`84`	`89`	`}`
`85`	`90`	`]`
`86`	`91`	`},`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,11 @@`
`33`	`33`	`"description": "an invalid URI",`
`34`	`34`	`"data": "\\\\WINDOWS\\fileshare",`
`35`	`35`	`"valid": false`
	`36`	`+ },`
	`37`	`+ {`
	`38`	`+ "description": "an invalid URI though valid URI reference",`
	`39`	`+ "data": "abc",`
	`40`	`+ "valid": false`
`36`	`41`	`}`
`37`	`42`	`]`
`38`	`43`	`},`