Commit Graph

3647 Commits

Author SHA1 Message Date
grossmj
e8353e68bb Merge remote-tracking branch 'origin/2.1' into 2.1 2017-12-21 09:38:28 +01:00
grossmj
23c63bbd4d Protect variable replacement for Qemu options. Escape double quotes. 2017-12-21 09:38:18 +01:00
ziajka
dadf11f69b Fix tests 2017-12-21 09:37:48 +01:00
ziajka
3efe753eee Add proper exception when cannot find tunnel on QEMU, Fixes: #1241 2017-12-21 08:55:49 +01:00
ziajka
f48420af58 Increase timeout for creation of image, Ref. #2239 2017-12-21 08:46:20 +01:00
grossmj
79bca29b93 Protect variable replacement for Qemu options. 2017-12-20 20:46:16 +01:00
grossmj
0e4865e049 Bump version to 2.1.1dev2 2017-12-20 11:20:07 +01:00
grossmj
26567d9164 Merge remote-tracking branch 'origin/2.1' into 2.1 2017-12-18 12:08:23 +01:00
grossmj
a8177d7afa Fix tests more reliably. Ref #0df997d. 2017-12-18 12:08:14 +01:00
ziajka
a393e7f723
Merge pull request #1205 from GNS3/aiohttp-2.3.1
aiohttp 2.3 support.
2017-12-18 11:09:16 +01:00
grossmj
0df997d232 Fix tests. 2017-12-17 23:06:19 +01:00
grossmj
630afc5469 Do not overwrites persistent Docker volumes. Fixes #2358. 2017-12-17 22:35:26 +01:00
grossmj
3e3e1df051 Allow users to see an error when the server cannot stream a PCAP file. 2017-12-07 12:28:01 -06:00
grossmj
3a1ba8f42d Fix issue with Qemu + SPICE when IPv4 is not enabled. 2017-12-07 12:02:41 -06:00
grossmj
0a72e0db87 Fix more GNS3 VM related tests. 2017-12-05 20:38:48 -06:00
grossmj
e3b3427cc6 Fix GNS3 VM start test. 2017-12-05 20:30:28 -06:00
grossmj
dde2003168 Fix tests. 2017-12-05 16:56:50 -06:00
grossmj
cfe8e9e85c Warn users if the GNS3 VM and local server are not in the same subnet. Fixes #1231. 2017-12-05 16:43:44 -06:00
grossmj
6e2752648a Implement #1153 into 2.2 branch. 2017-11-27 15:16:46 +07:00
grossmj
09b1cac676 Merge remote-tracking branch 'origin/2.2' into 2.2
# Conflicts:
#	requirements.txt
2017-11-27 14:21:02 +07:00
grossmj
1699ce5d1c Add missing appliance files. 2017-11-27 13:43:47 +07:00
grossmj
d0850927d0 Update appliance files. 2017-11-27 13:42:26 +07:00
grossmj
745532bf23 Fix auto idlepc test. 2017-11-23 23:46:22 +07:00
grossmj
78cf0309a0 Merge remote-tracking branch 'origin/2.1' into 2.1 2017-11-23 23:29:09 +07:00
grossmj
851fcf5c71 Fix compute auto idlepc test. 2017-11-23 23:28:52 +07:00
Jeremy Grossmann
a80355998d
Merge pull request #1230 from GNS3/consitance-about-exc
Keep consistance of aiohttp.web.HTTPForbidden() execution
2017-11-23 23:02:42 +07:00
grossmj
e54d574e47 Fix auto idle-pc from preferences. 2017-11-23 23:00:31 +07:00
ziajka
e754db950d
Merge pull request #1219 from GNS3/pyup-update-pytest-3.1.1-to-3.2.5
Update pytest to 3.2.5
2017-11-23 16:46:31 +01:00
ziajka
68d8fecc36
Merge pull request #1220 from GNS3/pyup-pin-prompt-toolkit-1.0.15
Pin prompt-toolkit to latest version 1.0.15
2017-11-23 16:39:57 +01:00
ziajka
5a6b0cc07b
Keep at least this version 2017-11-23 16:39:15 +01:00
ziajka
fe60c414b9 Keep consistance of aiohttp.web.HTTPForbidden() execution 2017-11-23 16:28:10 +01:00
grossmj
efbf7728ea Fix Docker tests. 2017-11-23 11:27:17 +07:00
grossmj
061af38b5a Make sure connected links are removed when a node is deleted. 2017-11-23 11:19:41 +07:00
grossmj
f48549a997 Validate idle-pc values for auto idle-pc feature. 2017-11-23 10:40:51 +07:00
grossmj
958ab2294c Merge remote-tracking branch 'origin/2.1' into 2.1 2017-11-23 10:04:46 +07:00
grossmj
dd89b09f84 Fix error when updating packet filter on stopped Docker link. Fixes #1229. 2017-11-23 10:04:32 +07:00
Jeremy Grossmann
642536a070
Merge pull request #1228 from GNS3/es-console
Close telnet console after stopping the node. Ref gui/#2330
2017-11-20 22:02:58 +07:00
ziajka
860ca3b35d Remotely close telnet console. Ref #2330 2017-11-20 15:28:07 +01:00
ziajka
96a0b52cf8 EthernetSwitch closing connections, Ref: gui/#2330 2017-11-20 13:51:07 +01:00
Jeremy Grossmann
7c90c513d0
Merge pull request #1227 from GNS3/improved-export-project
Export files from remote server, Fixes: gui/#2271
2017-11-20 17:19:20 +07:00
ziajka
fe59c937d5
Merge branch '2.1' into improved-export-project 2017-11-20 11:15:04 +01:00
ziajka
b48f5df53f iExport files from remote server, Fixes: gui/#2271 2017-11-20 10:47:03 +01:00
grossmj
3e2e8e61f7 New option: require KVM. If false, Qemu VMs will not be prevented to run without KVM. 2017-11-19 12:39:37 +07:00
grossmj
068077c594 Remove forgotten debug. 2017-11-18 17:36:39 +07:00
grossmj
e08aebf1f0 Implement variable replacement for Qemu VM options. 2017-11-18 17:36:11 +07:00
grossmj
cfbcc1194d Avoid duplicate "-nographic" option. 2017-11-18 16:22:29 +07:00
grossmj
035a078b5e Show qemu-img stdout in case of an error. 2017-11-17 18:13:34 +07:00
grossmj
cf14deb2fa Fix IOU tests. 2017-11-16 17:07:51 +07:00
grossmj
e1fe34ca07 Use the correct NVRAM amount when pushing private config to IOU. 2017-11-16 16:52:19 +07:00
grossmj
840aa39457 Merge remote-tracking branch 'origin/2.1' 2017-11-16 15:04:33 +07:00