334 Commits

Author	SHA1	Message	Date
Julien Duponchelle	699ecb7c89	Merge branch 'master' into 2.1	2017-07-11 18:59:50 +02:00
grossmj	5112f6fe56	Small changes for Dynamips NIO UDP.	2017-07-11 12:36:43 +07:00
Julien Duponchelle	557924e91a	Use ubridge for dynamips routers ... Ref #1109	2017-07-10 20:38:28 +02:00
Julien Duponchelle	7f4eeb56fa	Remove unusued code	2017-07-10 13:50:57 +02:00
ziajka	e0f0adf3c8	Added preferred Docker API version. Fixes #2136	2017-07-06 11:24:55 +02:00
ziajka	8e8b8bc5a5	WebSocket binary mode support for docker	2017-07-06 10:13:00 +02:00
Julien Duponchelle	4097bab565	Apply feedback from @grossmj	2017-07-05 16:36:39 +02:00
ziajka	c6f9ec3758	More information on Docker WebSocket error	2017-07-05 10:36:58 +02:00
Julien Duponchelle	08423eff96	Support packet filtering for VPCS ... https://github.com/GNS3/gns3-gui/issues/765	2017-07-04 15:12:26 +02:00
ziajka	c1a4bba101	Merge pull request #1091 from GNS3/bugfix-557 ... Bugfix 557	2017-06-27 11:17:12 +02:00
ziajka	931018b877	Fix passing tests	2017-06-27 11:11:07 +02:00
ziajka	6aa2afcf54	Fix #557 - mac addess collision when running IOU on multiple GNS3 servers	2017-06-27 10:09:21 +02:00
grossmj	1e37101641	Allow IOU 64-bit images.	2017-06-23 12:00:33 +02:00
Julien Duponchelle	bcdac6c969	Fix test for ethernet switch show arp	2017-06-23 10:54:05 +02:00
ziajka	7447b3190d	spice - added qxl vga support	2017-06-22 12:56:28 +02:00
Jeremy Grossmann	1b6cefd82b	Merge pull request #1055 from GNS3/embed_shell ... Fake console for simple Ethernet switch	2017-06-22 00:24:14 +02:00
grossmj	ad850f3857	Add port number in arp command output for Ethernet switch.	2017-06-22 00:23:33 +02:00
ziajka	bc5ec98cd5	Spice support ... * QEMU VNC options tests * QEMU - SPICE support at build options and schemas * SPICE console_type for nodes	2017-06-21 15:14:41 +02:00
Julien Duponchelle	a8e8eac0b4	Merge remote-tracking branch 'origin/master' into 2.1	2017-06-21 15:13:04 +02:00
Julien Duponchelle	5a1d313fca	Merge pull request #1080 from GNS3/spice-feature ... Spice feature	2017-06-21 10:37:04 +02:00
Julien Duponchelle	36dc264a6c	Revert "Spice feature"	2017-06-21 10:32:28 +02:00
Julien Duponchelle	e5bc7c7a66	Merge branch '2.1' into embed_shell	2017-06-19 11:10:24 +02:00
Julien Duponchelle	bb8097a052	Merge remote-tracking branch 'origin/master' into 2.1	2017-06-19 10:44:52 +02:00
ziajka	88c2353e2e	QEMU - SPICE support at build options and schemas	2017-06-16 10:17:26 +02:00
ziajka	5c0d955156	Fix: #1066 - Catching parsing errors at linked vbox file	2017-06-09 10:41:34 +02:00
ziajka	7235a312ab	Escaping VPCS name in regex #1067	2017-06-09 09:14:25 +02:00
Julien Duponchelle	ae328e5c50	Merge branch '2.1' into embed_shell	2017-06-07 18:21:41 +02:00
ziajka	eb6068c3d3	Fix Qemu disk creation with unicode characters not supported by local filesystem #1058 (#1063)	2017-06-07 12:35:41 +02:00
Julien Duponchelle	6a0345897d	Connector is no longer supported in ws_connect by aiohttp 2.0	2017-06-02 10:42:40 +02:00
Julien Duponchelle	7dfb634376	Fix for websocket usage with aiohttp 2.0 ... Fix #1050	2017-06-01 18:39:55 +02:00
Julien Duponchelle	93adef91d8	Merge branch '2.0' into 2.1	2017-05-31 16:58:31 +02:00
Julien Duponchelle	5616ab0e9a	Fake console for simple Ethernet switch ... Fix #454	2017-05-31 15:13:29 +02:00
Julien Duponchelle	b8ee8d69c8	Fix unexpected keyword argument 'conn_timeout' ... Fix #1047	2017-05-26 15:42:46 +02:00
Julien Duponchelle	5bb6c51698	Fix an error when logging Docker container fail to start	2017-05-23 13:31:04 +02:00
Julien Duponchelle	2a8911d19e	Keep DOCKER_MINIMUM_API_VERSION and DOCKER_MINIMUM_VERSION consistent	2017-05-23 11:00:15 +02:00
Bernhard Ehlers	8b7209ea78	Use docker version in error message of outdated docker installation	2017-05-23 10:41:42 +02:00
Bernhard Ehlers	7d48eba01b	Use versioned docker API ... Since docker v1.13 the unversioned docker API is deprecated. Backport of gns3-server 2.0, commit effbe59	2017-05-23 10:37:47 +02:00
Bernhard Ehlers	2191c487b6	Support images created by "docker commit". Fixes #1039	2017-05-23 10:23:11 +02:00
Jeremy Grossmann	82f1ab2be2	Merge pull request #1036 from GNS3/aiohttp_2.0 ... Aiohttp 2.0	2017-05-22 22:41:01 +02:00
Julien Duponchelle	a4245fcf44	Aiohttp 2.0 ... Ref #1000	2017-05-17 18:42:17 +02:00
grossmj	f338158654	Use 127.0.0.1 for local UDP tunnels to uBridge for Qemu. Ref #664.	2017-05-16 20:51:14 +02:00
Julien Duponchelle	cd17ef6b12	Merge branch '2.0' into 2.1	2017-05-15 15:46:50 +02:00
grossmj	bf38a8515e	Fix typo.	2017-05-12 18:54:54 +08:00
grossmj	942cc09eda	Fixes issue with connections when loading an ATM switch.	2017-05-12 18:00:58 +08:00
grossmj	18cfcaa081	Fixes ATM mapping.	2017-05-12 13:09:26 +08:00
grossmj	87d42f4eb9	Fixes Frame-relay VC mapping.	2017-05-12 12:39:01 +08:00
Julien Duponchelle	f31e46e8ed	Fix a race condition in logging when ubridge exit fast ... Fix #1025	2017-05-11 17:26:18 +02:00
Jeremy Grossmann	633cdef0bc	Merge pull request #987 from GNS3/nat_vmware ... NAT node can use the VMware NAT	2017-05-11 14:03:34 +08:00
grossmj	48dae085aa	Catch missing function listxattr on some Linux host.	2017-05-08 21:02:23 +07:00
Julien Duponchelle	3070a68273	Fix unicode error when reading ios configuration ... Fix #1013	2017-05-05 19:27:04 +02:00