1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-25 09:48:09 +00:00
Commit Graph

4229 Commits

Author SHA1 Message Date
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
grossmj
d3e55520d9 Merge remote-tracking branch 'remotes/origin/master' into 2.1 2017-11-16 15:03:20 +07:00
grossmj
fb2e10d3c1 Merge remote-tracking branch 'remotes/origin/master' 2017-11-16 14:59:57 +07:00
grossmj
4477cd4dfd Merge remote-tracking branch 'origin/2.1' 2017-11-16 14:54:53 +07:00
grossmj
967798a7de Check and fix corrupt Qemu disk images. Fixes #2301. 2017-11-16 14:54:37 +07:00
pyup-bot
0ce5b80a1d Pin prompt-toolkit to latest version 1.0.15 2017-11-15 13:20:52 +01:00
ziajka
61acb939a4 Update pyup config to use 2.2 branch 2017-11-15 13:20:31 +01:00
pyup-bot
49f1ef9693 Update pytest from 3.1.1 to 3.2.5 2017-11-15 13:17:57 +01:00
grossmj
8c11b649e5 Update warning messages when connecting to non custom adapter for VMware VMs. 2017-11-15 16:55:19 +07:00
grossmj
b14e2e73ed Fix "Can't use VirtualBox VM when an interface is managed by VirtualBox". Fixes #2335. 2017-11-15 16:41:33 +07:00
ziajka
2235a8158f
Update requirements.txt 2017-11-15 09:00:14 +01:00
grossmj
9afe756462 Add low disk space warning when creating a new project. 2017-11-14 18:22:59 +07:00
ziajka
135c529d4b Development on 2.1.1dev1 2017-11-09 10:49:56 +01:00
ziajka
ce219e81ea Development on 2.1.0dev11 2017-11-09 10:48:48 +01:00
ziajka
c2684f056c Release 2.1.0 2017-11-09 07:29:46 +01:00
ziajka
009677f019 Fix typo in vcpus on VirtualBoxVM, fixes: #1213 2017-11-07 11:15:49 +01:00
ziajka
9c3ee02797 Development on v2.1.0dev10 2017-11-07 10:19:19 +01:00
ziajka
50c8fe070d Release v2.1.0rc4 2017-11-07 08:47:40 +01:00
Jeremy Grossmann
ace7b0c69f
Merge pull request #1212 from GNS3/fix-vcpus-controll-on-vmware
Fix GNS3VM vCPUs control on VMware, fixes: #2324
2017-11-06 23:46:04 +08:00