Merge branch 'master' into unstable

CHANGELOG

@@ -1,5 +1,21 @@
 # Change Log
 
+## 1.3.6 16/06/2015
+
+* Fix an issue with 1.4dev compatibility
+
+## 1.3.5 16/06/15
+
+* Ignore invalid characters when reading the output of a process
+* Turn on / off authentication
+* Ensure no colored output on Windows
+* Do not stop saving IOS router configs when there is an exception while a project is committed.
+* Create a private config file if expected
+* Distribute our own version of netifaces working with python 3
+* Fix crash if a private config exist in IOS but no private config file
+* Basic Auth support
+* Fix crash when virtualbox list of VMS return an empty line
+
 ## 1.3.4 02/06/15
 
 * Drop useless dependencie dateutil

gns3server/crash_report.py

@@ -52,7 +52,7 @@ class CrashReport:
     Report crash to a third party service
     """
 
-    DSN = "sync+https://1d821222775c4cf3a66ee462e22780df:4f95f621d9b54d6a8afe0d92ed076969@app.getsentry.com/38482"
+    DSN = "sync+https://3d569add80c74d4faecf90836bcdc1b5:3b5aa0c47c1847bc8d019b5e52ebdd1a@app.getsentry.com/38482"
     if hasattr(sys, "frozen"):
         cacert = get_resource("cacert.pem")
         if cacert is not None and os.path.isfile(cacert):

setup.py

@@ -45,12 +45,27 @@ dependencies = [
     "raven>=5.2.0"
 ]
 
+<< << << < HEAD
 try:
     import netifaces
 except ImportError:
     # add gns3-netifaces only if netifaces isn't already installed
     # for instance via a Debian package.
     dependencies.append("gns3-netifaces>=0.10.4.1")
+== == == =
+dependencies = [
+    # "gns3-netifaces>=0.10.4.1",
+    "aiohttp>=0.14.4",
+    "jsonschema>=2.4.0",
+    "Jinja2>=2.7.3",
+    "raven>=5.2.0"]
+
+# if not sys.platform.startswith("win"):
+#    dependencies.append("netifaces==0.10.4")
+
+if sys.version_info == (3, 3):
+    dependencies.append("asyncio>=3.4.2")
+>>>>>> > master
 
 setup(
     name="gns3-server",