14 Commits

Author	SHA1	Message	Date
Julien Duponchelle	00fa1cc370	Merge branch 'master' into unstable	2015-05-08 14:45:07 +02:00
Jeremy	71e2586e17	Refactors how startup-config and private-config are handled for IOS routers.	2015-05-04 18:42:32 -06:00
Julien Duponchelle	359abb0286	Revert "Merge branch 'unstable'" ... This reverts commit 929c337e8b, reversing changes made to b9bc73fd01.	2015-04-30 16:43:30 +02:00
Jeremy	929c337e8b	Merge branch 'unstable' ... Conflicts: gns3server/modules/virtualbox/__init__.py gns3server/version.py tests/modules/test_manager.py	2015-04-29 16:29:45 -06:00
Julien Duponchelle	5f6d1bfdd6	Merge branch 'master' into unstable ... Conflicts: tests/modules/test_manager.py	2015-04-28 10:46:59 +02:00
Jeremy	b6a935aeb8	Return an explicit error when a NIO type is not supported by a VM.	2015-04-27 14:19:17 -06:00
Jeremy	40ce22222e	Merge branch 'unstable' into api_list_images ... Conflicts: gns3server/handlers/api/iou_handler.py	2015-04-23 17:19:37 -06:00
Julien Duponchelle	bca90bc563	API in order to get the list of IOU, Dynamips, Qemu images	2015-04-16 18:32:12 +02:00
grossmj	4136c29b0f	Config paths are not used when updating Dynamips or IOU VM settings.	2015-04-15 19:50:40 -06:00
grossmj	21587fda5a	Removes confreg setting for IOS routers.	2015-03-14 16:31:15 -06:00
grossmj	0f10d25c0b	Optional AUX console port allocation for Dynamips VMs.	2015-02-28 16:20:27 -07:00
Jeremy	8d02f464c5	Dynamips import/export configs.	2015-02-19 16:04:15 -07:00
Jeremy	3e95bb9748	Adapter settings and configs for Dynamips VMs.	2015-02-16 16:53:50 -07:00
grossmj	f99e834c37	Dynamips devices support (packet capture to complete).	2015-02-15 12:18:12 -07:00