Merge remote-tracking branch 'origin/master'

This commit is contained in:
grossmj committed 2015-04-14 18:21:42 -06:00
commit aab4a7243b
20 files changed
+197 -114

No files matched your search

+2 -3
View File
@@ -220,7 +220,7 @@ IOU_OBJECT_SCHEMA = {
IOU_NIO_SCHEMA = {
"$schema": "http://json-schema.org/draft-04/schema#",
"description": "Request validation to add a NIO for a VPCS instance",
"description": "Request validation to add a NIO for a IOU instance",
"type": "object",
"definitions": {
"UDP": {
@@ -317,8 +317,7 @@ IOU_INITIAL_CONFIG_SCHEMA = {
"properties": {
"content": {
"description": "Content of the initial configuration file",
"type": ["string", "null"],
"minLength": 1,
"type": ["string", "null"]
},
},
"additionalProperties": False,
+1 -1
View File
@@ -213,7 +213,7 @@ QEMU_UPDATE_SCHEMA = {
QEMU_NIO_SCHEMA = {
"$schema": "http://json-schema.org/draft-04/schema#",
"description": "Request validation to add a NIO for a VPCS instance",
"description": "Request validation to add a NIO for a QEMU instance",
"type": "object",
"definitions": {
"UDP": {