Merge branch 'master' into dev

gns3server/modules/qemu/schemas.py

@@ -82,12 +82,10 @@ QEMU_UPDATE_SCHEMA = {
         "hda_disk_image": {
             "description": "QEMU hda disk image path",
             "type": "string",
-            "minLength": 1,
         },
         "hdb_disk_image": {
             "description": "QEMU hdb disk image path",
             "type": "string",
-            "minLength": 1,
         },
         "ram": {
             "description": "amount of RAM in MB",
@@ -113,17 +111,14 @@ QEMU_UPDATE_SCHEMA = {
         "initrd": {
             "description": "QEMU initrd path",
             "type": "string",
-            "minLength": 1,
         },
         "kernel_image": {
             "description": "QEMU kernel image path",
             "type": "string",
-            "minLength": 1,
         },
         "kernel_command_line": {
             "description": "QEMU kernel command line",
             "type": "string",
-            "minLength": 1,
         },
         "options": {
             "description": "additional QEMU options",

gns3server/version.py

@@ -23,5 +23,5 @@
 # or negative for a release candidate or beta (after the base version
 # number has been incremented)
 
-__version__ = "1.0beta4.dev1"
+__version__ = "1.0beta4.dev2"
 __version_info__ = (1, 0, 0, -99)