arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-25 01:38:08 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/2.1' into 2.1

Browse Source
This commit is contained in:
grossmj 2017-09-14 17:58:25 +07:00
commit 60bc386d6b
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@ -1,5 +1,10 @@
# Change Log # Change Log
## 2.1.0rc1 13/09/2017
* Fix NAT node not working on Windows. Fixes #1163.
* Do not prevent a project to be deleted. Fixes #2237.
## 2.1.0b2 05/09/2017 ## 2.1.0b2 05/09/2017
* Round-robin nodes across all available compute resources. Fixes #1165. * Round-robin nodes across all available compute resources. Fixes #1165.

2
gns3server/crash_report.py
View File

@ -57,7 +57,7 @@ class CrashReport:
Report crash to a third party service Report crash to a third party service
""" """
DSN = "sync+https://813fc16ef4624d1da49210217a19c8aa:732b290d64214e9c99a75336bf96d3fe@sentry.io/38482" DSN = "sync+https://2d27a0554eb940d5b7729acb4cf1bb99:874ec597a2c044319fcb4183b11af0f9@sentry.io/38482"
if hasattr(sys, "frozen"): if hasattr(sys, "frozen"):
cacert = get_resource("cacert.pem") cacert = get_resource("cacert.pem")
if cacert is not None and os.path.isfile(cacert): if cacert is not None and os.path.isfile(cacert):

3
gns3server/version.py
View File

@ -23,8 +23,9 @@
# or negative for a release candidate or beta (after the base version # or negative for a release candidate or beta (after the base version
# number has been incremented) # number has been incremented)
__version__ = "2.1.0dev5" __version__ = "2.1.0dev6"
__version_info__ = (2, 1, 0, -99) __version_info__ = (2, 1, 0, -99)
# If it's a git checkout try to add the commit # If it's a git checkout try to add the commit
if "dev" in __version__: if "dev" in __version__:
try: try: