Commit Graph
48 Commits
Author SHA1 Message Date
Jerry Seutter f1503ae655 Handle initrd and kernel paths in qemu 2014-12-08 20:14:55 -07:00
Jerry Seutter 00f49e337d Merge branch 'master' into dev 2014-12-08 14:22:31 -07:00
Jerry Seutter 9ec1373d36 dms terminates instance if id matches 2014-11-24 16:49:01 -07:00
Jerry Seutter b220cffcf4 Updating dms to look for cloud_region instead of region 2014-11-24 16:40:55 -07:00
Jerry Seutter 7ef8dd794a Copy updated cloud/ module from gns3-gui 2014-11-24 16:24:57 -07:00
Jerry Seutter b9a4531544 Ensuring dead_time is an integer 2014-11-24 15:35:09 -07:00
Jerry Seutter cfdff773c4 deadtime -> dead_time 2014-11-24 15:08:58 -07:00
Jerry Seutter ef8c6b603c Add debugging to deadman process 2014-11-24 14:32:06 -07:00
jseutter 387896fa69 Merge pull request #10 from planctechnologies/gns-129
Move image path manipulation to server side
2014-11-12 14:22:10 -07:00
jseutter 4d9d6ae5dd Merge pull request #9 from planctechnologies/gns-125
Add support for Qemu devices on cloud instances
2014-11-12 14:19:58 -07:00
Jerry Seutter 5b73786653 Move image path manipulation to server side 2014-11-10 11:28:19 -07:00
Jerry Seutter faa3ef8cb4 Add support for Qemu devices on cloud instances 2014-11-07 20:42:08 -07:00
Jerry Seutter 0b0830976f Support IOU devices on cloud instances 2014-11-06 15:50:46 -07:00
Jerry Seutter e5fa52fcb5 Adding back a line that was mistakenly removed. 2014-10-31 10:26:53 -06:00
Jerry Seutter ff02bb977a Merge branch 'master' into dev 2014-10-31 10:02:58 -06:00
Jerry Seutter d2798a969e Cleanup 2014-10-28 11:27:41 -06:00
Jerry Seutter 148b99c553 Cleanup 2014-10-28 11:09:43 -06:00
Jerry Seutter 5f9554b86c Cleanup 2014-10-28 11:07:44 -06:00
Jerry Seutter 3a157b5e6d Handle a missing cloud server section in the config file 2014-10-28 11:01:17 -06:00
Jerry Seutter 7830bf8b1a Merge branch 'dev' into gns-110 2014-10-28 10:39:03 -06:00
Jerry Seutter ee1dbd6cd3 Merge branch 'master' into dev 2014-10-28 09:38:37 -06:00
Jerry Seutter c4afc33ea8 IOS devices can be deployed on cloud instances. 2014-10-27 18:12:56 -06:00
Jerry Seutter 91894935bf Merge branch 'dev' into gns-110 2014-10-21 15:39:14 -06:00
Jerry Seutter 6d80d3e70d Merge branch 'master' into dev 2014-10-20 11:22:04 -06:00
Jerry Seutter c08e1011ed Make the server download images from cloud files 2014-10-15 15:51:00 -06:00
Jerry Seutter a833925497 Copied fresh cloud files from gns gui repo 2014-10-15 15:50:24 -06:00
Jerry Seutter f287f5141a Update .gitignore file 2014-10-14 13:55:17 -06:00
Jerry Seutter c0fc093ab7 Merge branch 'master' into dev 2014-10-10 15:24:08 -06:00
Jerry Seutter c66fbbdb36 Merge improved ssl and auth support 2014-09-29 18:24:28 -06:00
Jerry Seutter 03fb75437b Add cert and auth support to gns3server. 2014-09-29 18:19:35 -06:00
Jerry Seutter 3833803244 Copy deadman switch code from old repository into gns3server. 2014-09-29 18:14:07 -06:00
Jerry Seutter 7c446796fe gns3server now controls the deadman switch. 2014-09-29 18:09:16 -06:00
Jerry Seutter ee88d6f808 Merge branch 'master' into dev 2014-09-29 17:24:52 -06:00
Jerry Seutter d4d774055a Remove unused parameter 2014-09-29 16:01:39 -06:00
Jerry Seutter efc80ff17a Revert version number change 2014-09-29 15:59:49 -06:00
Jerry Seutter 91fba4aca4 Use logging config to set destination of copyright info 2014-09-29 15:56:01 -06:00
Jerry Seutter 23686215fe Add a --quiet mode to gns3server 2014-09-25 14:42:37 -06:00
Jerry Seutter 3b465890b6 Increase sleep to work around Rackspace slowness 2014-09-22 09:10:30 -06:00
Jerry Seutter cf59240bef Bugfixes with cloud server communication 2014-09-21 21:41:51 -06:00
Jerry Seutter b132c901c9 Disabling auth from version string 2014-09-18 20:39:12 +00:00
jseutter 800d4d91f9 Merge pull request #5 from planctechnologies/gns3-87-bugfixes
Gns-87 bugfixes
2014-09-11 14:48:26 -06:00
Jerry Seutter 6421367259 Importing changeset from gns3dms repo 2014-09-08 15:35:22 +00:00
jseutter 6ff2c654d9 Merge pull request #4 from planctechnologies/gns3-87
Gns3 87 - add server security and startup scripts
2014-09-08 09:25:28 -06:00
Jerry Seutter e2f3d2aca8 Pull from dev 2014-09-03 20:39:02 +00:00
Jerry Seutter 5e72fcbe14 GNS-42 - Move deadman switch into gns3server codebase 2014-08-29 18:05:56 +00:00
Jerry Seutter fd6e4954e4 Merge branch 'master' into dev 2014-06-27 14:26:58 +00:00
Jerry Seutter ab42b41d39 Merge remote-tracking branch 'origin/gns-80-cloud-image' into dev
Conflicts:
	cloud-image/create_image.py
2014-06-27 14:19:17 +00:00
Jerry Seutter ff0201bb4f Syntax cleanup 2014-06-26 14:35:19 +00:00