Commit Graph
7826 Commits
Author SHA1 Message Date
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
ziajka 9921db2183 Merge branch '2.1' into 2.2 2018-01-30 08:53:23 +01:00
ziajka 4f2a50894b Merge pull request #1277 from GNS3/av-pywin32
Fix AppVeyor crashes with pypiwin32-222 Ref. #1276
2018-01-30 08:52:35 +01:00
Jeremy Grossmann 62e03148c1 Merge pull request #1275 from GNS3/async-md5-calcs
Calculate MD5 on thread and before json response, Ref. gui#2239
2018-01-29 23:28:11 +07:00
ziajka 889aa3ba94 More generic dependency for pypiwin32, Ref. #1276 2018-01-29 15:26:45 +01:00
ziajka cbb15c7a84 Check if locking version of pypiwin32==220 helps, Ref. #1276 2018-01-29 15:16:38 +01:00
ziajka 8268e76a86 Check if passes tests on 2.1 2018-01-29 15:09:03 +01:00
ziajka bb26e8acdd Calculate MD5 on thread and before json response, Ref. gui#2239 2018-01-29 14:20:48 +01:00
ziajka 1582ac3195 Merge branch '2.2' into async-md5-calcs 2018-01-29 13:01:45 +01:00
ziajka 7fe6508e73 Merge pull request #1274 from GNS3/asyncio-ensure-future
Conservative approach to supported versions of Python 3.4 and asyncio…
2018-01-29 12:21:41 +01:00
ziajka eeae07e783 Conservative approach to supported versions of Python 3.4 and asyncio.ensure_future, Ref. #1269 2018-01-29 12:13:20 +01:00
ziajka dc377165f2 Cancellable md5sum calculation on thread, Ref. gui#2239 2018-01-29 10:18:13 +01:00
ziajka 6868e20a70 Compute md5sum on thread and don't block main server, Ref. gui#2239 2018-01-26 12:53:48 +01:00
ziajka 3c5ca9ce0e Merge pull request #1270 from GNS3/replace-async-with-ensure-future
Replace asyncio.async with ensure_future because of deprecation, Fixe…
2018-01-24 11:18:10 +01:00
ziajka d9a0ec9ff3 Replace asyncio.async with ensure_future because of deprecation, Fixes: #1269 2018-01-24 11:11:53 +01:00
ziajka 838d82a98b Merge branch '2.2' of github.com:GNS3/gns3-server into 2.2 2018-01-24 10:55:08 +01:00
ziajka 05983f2838 Fix test_open_auto_start test 2018-01-24 10:54:56 +01:00
ziajka c532e6392d Merge pull request #1257 from GNS3/pyup-update-sphinx-1.6.2-to-1.6.6
Update sphinx to 1.6.6
2018-01-24 10:15:07 +01:00
ziajka e05f93abd3 Merge pull request #1268 from GNS3/pyup-pin-prompt-toolkit-1.0.15
Pin prompt-toolkit to latest version 1.0.15
2018-01-24 10:14:57 +01:00
ziajka daf058a306 Merge tag 'v2.1.3' 2018-01-24 10:09:31 +01:00
pyup-bot 647c1dbb05 Pin prompt-toolkit to latest version 1.0.15 2018-01-23 06:47:36 +01:00
grossmj 28f8216590 Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/version.py
#	requirements.txt
2018-01-23 12:47:13 +07:00
grossmj e54ccc26b0 Bump to version 2.2.0dev1 & refresh resources/ui files. 2018-01-23 11:36:57 +07:00
ziajka f7d82059d5 Development on v2.1.4dev1 2018-01-19 07:18:00 +01:00
ziajka d2faaee099 Release v2.1.3 v2.1.3 2018-01-19 07:15:39 +01:00
grossmj 6fee543ce7 Fix more client/server version tests. 2018-01-18 16:14:09 +08:00
grossmj 2e40fb8608 Fix client/server version test. 2018-01-18 16:04:31 +08:00
grossmj d4f1084391 Bump version number to 2.1.3dev1 2018-01-18 15:32:06 +08:00
ziajka b792be00f9 Merge tag 'v2.1.2' 2018-01-18 08:29:40 +01:00
grossmj cf4477ce34 Merge remote-tracking branch 'origin/unlock-yarl' into 2.1 2018-01-18 12:10:19 +08:00
grossmj f525bd2ce1 Update appliance files. 2018-01-18 11:57:48 +08:00
grossmj bd8816d14c Suspend for Docker nodes. 2018-01-18 11:43:04 +08:00
ziajka 34acb1f185 Unlock yarl version and multidict 2018-01-17 10:26:22 +01:00
grossmj 7ded71142f Fix same MAC address for duplicated Qemu nodes. 2018-01-17 14:13:06 +08:00
grossmj c281f55fb2 Fix same base MAC for duplicated IOS routers. Fixes #1264. 2018-01-17 14:01:44 +08:00