1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-04 22:28:12 +00:00
Commit Graph

2994 Commits

Author SHA1 Message Date
Julien Duponchelle
c6e00bb4ac Merge pull request #169 from GNS3/upload_images
Upload images API
2015-05-10 21:07:22 +02:00
Julien Duponchelle
bb4ebbfe64 Upload images API
Conflicts:
	requirements.txt
	setup.py
2015-05-10 21:06:31 +02:00
Jeremy Grossmann
61fb641215 Merge pull request #168 from GNS3/listen
A notification stream with process monitoring.
2015-05-09 17:15:58 -06:00
grossmj
2a462de7f3 Merge remote-tracking branch 'origin/unstable' into unstable 2015-05-08 18:30:48 -06:00
grossmj
13eb461dfe Update default VMware VM location path for OSX. 2015-05-08 18:30:41 -06:00
Jeremy Grossmann
924f604fe5 Merge pull request #184 from boenrobot/setupAndReadmeFix
Readme + setup.py/requrements.txt sync
2015-05-08 18:23:16 -06:00
Vasil Rangelov
91ff6e5ae9 Updated compilation instructions for Windows.
Synced up requirements.txt and setup.py dependencies.
2015-05-09 03:18:32 +03:00
Julien Duponchelle
00fa1cc370 Merge branch 'master' into unstable 2015-05-08 14:45:07 +02:00
Jeremy
c197b39a68 Find VMware VMs using the inventory and alternatively using the default vm location (for VMware player). 2015-05-07 16:50:37 -06:00
Jeremy
bebdadc465 Bump version to 1.3.3.dev3 2015-05-07 11:52:17 -06:00
Julien Duponchelle
b0ce091a4c 1.3.3rc1 2015-05-07 16:03:51 +02:00
Jeremy
d21469a916 Return an error if an adapter slot doesn't exist on an IOS router. 2015-05-06 17:22:07 -06:00
Jeremy
b57a023394 NIO NAT support for VirtualBox VMs. 2015-05-06 15:21:39 -06:00
grossmj
a929dfea38 Merge remote-tracking branch 'origin/master' 2015-05-06 14:59:35 -06:00
grossmj
fcff2d0813 NIO NAT support for QEMU VMs (user mode back-end is used). 2015-05-06 14:59:01 -06:00
Julien Duponchelle
ed39afbf3d Throw an error if user put an invalid port range in config file
Fix #117
2015-05-06 10:40:51 +02:00
Julien Duponchelle
3ba4789ba6 New crash report key
Fix #180
2015-05-06 09:55:14 +02:00
grossmj
17b93e6a89 Bump version to 1.3.3dev2 2015-05-05 14:49:03 -06:00
Julien Duponchelle
4b21135ba7 Turn off configuration parser interpolation 2015-05-05 11:53:33 +02:00
Julien Duponchelle
a3f00e1f45 Catch configuration file parsing errors
Fix #176
2015-05-05 11:44:35 +02:00
Julien Duponchelle
b7dac1bec4 Force closing the event loop to avoid warning with Python 3.4.3
Fix #177
2015-05-05 11:33:47 +02:00
Julien Duponchelle
18c4154376 Catch error when you can't mark a project as no longer temporary
Fix #172
2015-05-05 10:51:51 +02:00
Julien Duponchelle
22efc7488f Catch BrokenPipeError for OSX frozen server
Fix #166
2015-05-05 10:46:09 +02:00
grossmj
9eeb8910fb Match how IOU initial-config is set for VPCS VM. 2015-05-04 21:54:56 -06:00
Jeremy
71e2586e17 Refactors how startup-config and private-config are handled for IOS routers. 2015-05-04 18:42:32 -06:00
Julien Duponchelle
ee2dada88b Fix tests 2015-05-04 21:29:28 +02:00
Jeremy
c4054cf810 Catch the "WinError 0 The operation completed successfully" exception at a higher level. 2015-05-04 12:14:04 -06:00
Julien Duponchelle
d2d91ebdea Fix temporary project not cleanup with save as 2015-05-04 14:04:57 +02:00
Julien Duponchelle
0dea63c9ea If image is not found in VM directory look in images folder 2015-05-04 10:57:08 +02:00
grossmj
3467b42ab5 Ordered MAC addresses for QEMU based VMs. 2015-05-03 13:18:18 -06:00
grossmj
65103e9332 Merge remote-tracking branch 'origin/master' 2015-05-03 11:41:09 -06:00
grossmj
f6bc823b58 Fixes #171. 2015-05-03 11:40:55 -06:00
grossmj
a260377f0e List all available VMware VMs. 2015-05-01 18:47:46 -06:00
Julien Duponchelle
151788e48a Force utf-8 configuraton files reading
Fix #170
2015-05-01 17:49:16 +02:00
Julien Duponchelle
e9ec5c8a37 A notification stream with process monitoring 2015-05-01 13:20:30 +02:00
Julien Duponchelle
57f5e7a7d9 Merge branch 'master' into unstable 2015-05-01 13:20:09 +02:00
Julien Duponchelle
c3c6b29854 Merge commit '359abb0286fe25d60ac2155bbed869d068a15868' into unstable 2015-05-01 13:18:17 +02:00
Julien Duponchelle
827d04bed4 Merge commit 'd18293ae7c54684aba101ca3931f2331b8ea050e' into unstable
Second master to unstable bad merge commit
2015-05-01 11:57:14 +02:00
Julien Duponchelle
ba658a4712 Merge commit '929c337e8bf33f060c884368628b279550248925' into unstable
It's the bad unstable => master commit
2015-05-01 11:56:19 +02:00
Julien Duponchelle
b3f2a6ac2a Fix tests and build documentation 2015-05-01 11:24:56 +02:00
Julien Duponchelle
e6eab1fb25 Aiohttp 0.15.1
Conflicts:
	requirements.txt
	setup.py
2015-05-01 10:57:28 +02:00
Julien Duponchelle
6b70fa9794 Do not list file starting with a . in upload handler 2015-05-01 10:55:08 +02:00
Jeremy
ab60d7929b Basic VMware support (start & stop a VM). 2015-04-30 19:05:37 -06:00
Julien Duponchelle
359abb0286 Revert "Merge branch 'unstable'"
This reverts commit 929c337e8b, reversing
changes made to b9bc73fd01.
2015-04-30 16:43:30 +02:00
grossmj
d18293ae7c Fixes list images in VirtualBox. 2015-04-29 22:17:17 -06:00
Jeremy
929c337e8b Merge branch 'unstable'
Conflicts:
	gns3server/modules/virtualbox/__init__.py
	gns3server/version.py
	tests/modules/test_manager.py
2015-04-29 16:29:45 -06:00
Julien Duponchelle
f8f6f5dc5d Merge branch 'master' into unstable
Conflicts:
	gns3server/modules/virtualbox/__init__.py
	gns3server/version.py
2015-04-29 14:25:44 +02:00
Julien Duponchelle
b9bc73fd01 Do not crash when closing a project if VirtualBox is not accessible
Fix #164
2015-04-29 14:24:27 +02:00
Julien Duponchelle
e75fbc9d73 Catch connection reset errors
Fix #162
2015-04-29 11:15:32 +02:00
grossmj
0311a0086e Fixes typo. 2015-04-28 22:16:15 -06:00