arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-24 17:28:08 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Jerry Seutter 2014-10-10 15:24:08 -06:00
commit c0fc093ab7
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gns3server/modules/qemu/schemas.py
View File

@ -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",

2
gns3server/version.py
View File

@ -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)