NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-03 22:11:14 +02:00
Code Issues Packages Projects Releases Wiki Activity
5,660 Commits 6 Branches 229 Tags
e80e80a08087f84d44a05c503496b41704c8f1cb
Commit Graph
5660 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
grossmj a3a0657502 Do not raise exception if Dynamips or uBridge hypervisor don't return data and are still running. Fixes #1289 2018-03-07 19:11:34 +07:00
grossmj 3ca4f72b99 Fix Dynamips private config not loaded into nvram when starting a router. Fixes #1313. 2018-03-07 18:18:51 +07:00
grossmj d911e82dc4 Merge remote-tracking branch 'origin/2.1' into 2.1 2018-03-07 16:42:12 +07:00
grossmj c93d0d8d12 Make sure we don't try to read when opening a file in binary more. Fixes #1301. 2018-03-07 16:39:04 +07:00
ziajka 2a5f3221b9 Merge pull request #1314 from GNS3/pyup-update-pytest-3.4.1-to-3.4.2 
Update pytest to 3.4.2
 2018-03-06 09:24:58 +01:00
pyup-bot 78ea230673 Update pytest from 3.4.1 to 3.4.2 2018-03-06 04:57:22 +01:00
ziajka 53a229f8e9 Fix never reached condition 2018-03-05 11:16:03 +01:00
ziajka 419797dd92 Merge pull request #1312 from GNS3/controller-compat 
Compatybility with controller, default_symbol and hover_symbol, Fixes…
 2018-03-02 13:49:32 +01:00
ziajka 05b6be2e42 Compatybility with controller, default_symbol and hover_symbol, Fixes: #2444 2018-03-02 13:48:27 +01:00
ziajka c714c9c8de Merge pull request #1310 from GNS3/fix-1297 
Filter snapshots directory during the snapshot, Fixes: #1297
 2018-02-28 16:40:18 +01:00
ziajka 9be76d98a2 Filter snapshots directory during the snapshot, Fixes: #1297 2018-02-28 16:38:32 +01:00
ziajka 09c7d73ee9 Filter snapshots directory during the snapshot, Fixes: #1297 2018-02-28 16:33:20 +01:00
ziajka 9e73ca6620 Merge pull request #1309 from GNS3/fix-2420 
Handle docker env with last empty line, Fixes: #2420
 2018-02-27 16:41:24 +01:00
ziajka e79e27a73f Handle docker env with last empty line, Fixes: #2420 2018-02-27 16:33:55 +01:00
ziajka 7beae4e451 Merge pull request #1308 from GNS3/pywin32-dep 
Pywin32 instead of pypiwin32, Ref. #1276
 2018-02-27 09:27:54 +01:00
Jeremy Grossmann a0f2dd374e Require uBridge version 0.9.14 on Linux 2018-02-26 23:18:44 +07:00
ziajka b1657996e3 Pywin32 instead of pypiwin32, Ref. #1276 2018-02-26 16:25:31 +01:00
ziajka 835bc24b44 Merge pull request #1304 from GNS3/pyup-update-sphinx-1.6.6-to-1.7.1 
Update sphinx to 1.7.1
 2018-02-26 09:14:40 +01:00
Jeremy Grossmann e83ed3b4b5 Merge pull request #1295 from ehlers/fix_cpuload 
Implement a minimum interval between psutil calls. Fixes #2262
 2018-02-26 13:08:10 +06:30
pyup-bot 603442509a Update sphinx from 1.6.6 to 1.7.1 2018-02-23 19:59:09 +01:00
ziajka 89b352890c Merge pull request #1303 from GNS3/pyup-update-pytest-3.3.2-to-3.4.1 
Update pytest to 3.4.1
 2018-02-21 11:59:38 +01:00
ziajka 56b901a831 pytest.ini for ignoring files and recording DEBUG level in tests 2018-02-21 11:05:50 +01:00
ziajka 1b3065750d .pytest_cache into .gitignore 2018-02-21 10:27:01 +01:00
ziajka f1d8ee30cd pytest-catchlog merged into the core 2018-02-21 10:26:30 +01:00
ziajka 2111f549c9 Merge pull request #1302 from nabilbendafi/master 
Fix missing 'locales' package in base image
 2018-02-21 10:14:01 +01:00
pyup-bot 629c7be395 Update pytest from 3.3.2 to 3.4.1 2018-02-21 03:03:33 +01:00
Nabil BENDAFI 3a15839272 Fix missing 'locales' package in base image 
`/bin/sh: 1: locale-gen: not found`
 2018-02-20 16:43:22 +01:00
Bernhard Ehlers 3a09bd43dc Implement a minimum interval between psutil calls. Fixes #2262 2018-02-13 11:31:04 +01:00
grossmj 17422bc461 Fix appliance loading test (missing category). 2018-02-06 16:55:40 +08:00
grossmj 935b8981ea Fix appliance loading test. 2018-02-06 16:15:34 +08:00
grossmj fff593b358 Fix error when appliance template is broken (missing fields). Fixes #1287. 2018-02-06 16:07:23 +08:00
grossmj abbe3d3a31 Fix "Change of linked base VM doesn't work with templates migrated from 2.0" 2018-02-05 16:42:29 +08:00
grossmj 52b690b683 Fix "Unable to override non-custom VMware adapter". 2018-02-04 22:08:41 +08:00
grossmj 654aa18d09 Fix get_port test. 2018-02-02 22:14:50 +08:00
grossmj 519df3ab35 Let a project be opened when a port cannot be found (can happens if a project is corrupted). 2018-02-02 22:05:51 +08:00
grossmj 4ba523a0d7 Add an error message when Docker container is not ready to be started. Ref #1281. 2018-02-02 16:29:08 +08:00
grossmj 07d2d7b340 Update documentation. 2018-01-31 23:37:02 +07:00
grossmj e5a4afaeb1 Sync appliance files. 2018-01-31 19:05:03 +07:00
grossmj 3802a3d70b Fix more IOU tests. 2018-01-31 16:34:41 +07:00
grossmj 0ee87c9110 Fix IOU tests. 2018-01-31 16:12:55 +07:00
grossmj e5c76750b1 Fix issue when running multiple project containing IOU nodes on the same server. Ref #1239. 2018-01-31 15:51:29 +07:00
grossmj 1045364adc Set first byte to 52 when generating a random MAC address for a Qemu VM. Ref #1267. 2018-01-30 18:26:38 +07:00
grossmj 008baad86a Update link state and save project when a link is suspended or filters are added/removed (without node properties set). 2018-01-30 17:39:33 +07:00
ziajka c0ff37039d Merge pull request #1278 from GNS3/pyup-update-pytest-3.2.5-to-3.3.2 
Update pytest to 3.3.2
 2018-01-30 09:00:17 +01:00
ziajka 29b9b0431c Merge branch '2.2' into pyup-update-pytest-3.2.5-to-3.3.2 2018-01-30 09:00:08 +01:00
ziajka cf5b24e829 Merge pull request #1279 from GNS3/pyup-update-pep8-1.7.0-to-1.7.1 
Update pep8 to 1.7.1
 2018-01-30 08:59:06 +01:00
ziajka f9853a1cc3 Merge pull request #1280 from GNS3/pyup-update-pytest-timeout-1.2.0-to-1.2.1 
Update pytest-timeout to 1.2.1
 2018-01-30 08:58:47 +01:00
pyup-bot d14e3d084d Update pytest-timeout from 1.2.0 to 1.2.1 2018-01-30 08:58:07 +01:00
pyup-bot 53e36d1ed5 Update pep8 from 1.7.0 to 1.7.1 2018-01-30 08:58:03 +01:00
pyup-bot 403645d2f0 Update pytest from 3.2.5 to 3.3.2 2018-01-30 08:57:47 +01:00