Merge 2.1 branch into 2.2

This commit is contained in:
grossmj 2019-05-18 13:45:39 +07:00
commit 9400c49b82
2 changed files with 9 additions and 4 deletions

View File

@ -10,6 +10,10 @@
* Prevent locked nodes to be deleted. Fixes https://github.com/GNS3/gns3-gui/issues/2764 * Prevent locked nodes to be deleted. Fixes https://github.com/GNS3/gns3-gui/issues/2764
* Remove old unused argument option. Fixes #1569 * Remove old unused argument option. Fixes #1569
## 2.1.17 17/05/2019
* Force aiohttp version to 2.3.10 and aiohttp-cors version to 0.5.3 This is to fix build issue for Ubuntu 19.04 package on Launchpad. Ref #1583 https://github.com/GNS3/gns3-gui/issues/2774
## 2.1.16 15/04/2019 ## 2.1.16 15/04/2019
* Fix broken embedded console for Ethernet switch. Fixes #1574 * Fix broken embedded console for Ethernet switch. Fixes #1574

View File

@ -23,7 +23,7 @@ master is the next stable release, you can test it in your day to day activities
Bug fixes or small improvements pull requests go here. Bug fixes or small improvements pull requests go here.
2.x (2.1 for example) 2.x (2.1 for example)
******** *********************
Next major release Next major release
*Never* use this branch for production. Pull requests for major new features go here. *Never* use this branch for production. Pull requests for major new features go here.
@ -100,7 +100,7 @@ All the init script require the creation of a GNS3 user. You can change it to an
sudo adduser gns3 sudo adduser gns3
upstart upstart
~~~~~~~ -------
For ubuntu < 15.04 For ubuntu < 15.04
@ -113,7 +113,8 @@ You need to copy init/gns3.conf.upstart to /etc/init/gns3.conf
systemd systemd
~~~~~~~~ -------
You need to copy init/gns3.service.systemd to /lib/systemd/system/gns3.service You need to copy init/gns3.service.systemd to /lib/systemd/system/gns3.service
.. code:: bash .. code:: bash
@ -219,5 +220,5 @@ If you want test coverage:
Security issues Security issues
---------------- ----------------
Please contact us using contact informations available here: Please contact us using contact form available here:
http://docs.gns3.com/1ON9JBXSeR7Nt2-Qum2o3ZX0GU86BZwlmNSUgvmqNWGY/index.html http://docs.gns3.com/1ON9JBXSeR7Nt2-Qum2o3ZX0GU86BZwlmNSUgvmqNWGY/index.html