grossmj
|
90ce6093d8
|
Some spring cleaning.
|
2018-03-15 14:17:39 +07:00 |
|
grossmj
|
658aa4bae9
|
Merge 2.1 into 2.2 branch
|
2018-03-12 13:38:50 +07:00 |
|
Julien Duponchelle
|
f557ec4bda
|
Fix regression in docker introduce by 2.0 merge
|
2017-07-12 17:59:29 +02:00 |
|
Julien Duponchelle
|
699ecb7c89
|
Merge branch 'master' into 2.1
|
2017-07-11 18:59:50 +02:00 |
|
ziajka
|
e0f0adf3c8
|
Added preferred Docker API version. Fixes #2136
|
2017-07-06 11:24:55 +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
|
b8ee8d69c8
|
Fix unexpected keyword argument 'conn_timeout'
Fix #1047
|
2017-05-26 15:42:46 +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 |
|
Julien Duponchelle
|
a4245fcf44
|
Aiohttp 2.0
Ref #1000
|
2017-05-17 18:42:17 +02:00 |
|
Bernhard Ehlers
|
56d91b648c
|
Fix connection to websocket with last docker release
Fix https://github.com/GNS3/gns3-gui/issues/1994
Signed-off-by: Julien Duponchelle <julien@gns3.net>
|
2017-04-28 16:06:43 +02:00 |
|
Bernhard Ehlers
|
1b0f5c63b8
|
Fix connection to websocket with last docker release
Fix https://github.com/GNS3/gns3-gui/issues/1994
Signed-off-by: Julien Duponchelle <julien@gns3.net>
|
2017-04-28 16:03:26 +02:00 |
|
Julien Duponchelle
|
1a90305baa
|
Docker minimum api is 1.25
|
2017-04-24 18:43:12 +02:00 |
|
Julien Duponchelle
|
effbe59414
|
Lock docker API to 1.27
Fix https://github.com/GNS3/gns3-gui/issues/1994
|
2017-04-24 17:51:55 +02:00 |
|
Julien Duponchelle
|
8b9f22c30c
|
Handling server disconnect error when docker daemon die
Fix #985
|
2017-04-24 17:37:41 +02:00 |
|
Julien Duponchelle
|
7302f65ffe
|
Catch timeout error on docker
Fix #981
|
2017-04-18 11:44:20 +02:00 |
|
Julien Duponchelle
|
2564740665
|
Fix limit of 20 docker containers
Fix #963
|
2017-03-28 11:54:16 +02:00 |
|
Julien Duponchelle
|
132bc87081
|
Dissallow parallel pull of docker images
Fix #962
|
2017-03-27 20:46:25 +02:00 |
|
Julien Duponchelle
|
34f5a6f82c
|
Fix Session is closed when listing docker images
Fix #955
|
2017-03-20 23:50:31 +01:00 |
|
Julien Duponchelle
|
78c154e376
|
Cleanup docker source code
|
2017-03-20 20:30:59 +01:00 |
|
Julien Duponchelle
|
a571b1a2f8
|
Use aiohttp session for docker queries
|
2017-03-20 19:46:50 +01:00 |
|
Julien Duponchelle
|
a62b791c68
|
Fix TypeError: http_query() got an unexpected keyword argument 'timeout'
Fix #947
|
2017-03-20 17:06:00 +01:00 |
|
Julien Duponchelle
|
666461277d
|
Fix a crash with some docker images
Fix #861
|
2017-01-10 10:09:34 +01:00 |
|
Julien Duponchelle
|
ca4d09ea40
|
Merge branch 'master' into 2.0
|
2016-07-05 15:41:53 +02:00 |
|
Julien Duponchelle
|
c0b09ae76a
|
Merge branch '1.5' into 2.0
|
2016-06-27 14:24:48 +02:00 |
|
grossmj
|
04022677bd
|
Use uBridge for Qemu connections. Ref #267.
Handle packet captures for VPCS & Qemu nodes. Fixes #548.
|
2016-06-23 16:56:06 -06:00 |
|
Julien Duponchelle
|
32252e5193
|
Merge branch '1.5' into 2.0
|
2016-06-21 09:58:28 +02:00 |
|
Julien Duponchelle
|
6949976d12
|
Merge branch '1.5' into 2.0
|
2016-06-20 12:45:56 +02:00 |
|
Julien Duponchelle
|
d5895c3a47
|
Merge branch '1.5' into 2.0
|
2016-05-18 11:25:41 +02:00 |
|
grossmj
|
f81d35cc29
|
Handlers: cleanup and fixes.
|
2016-05-13 18:00:07 -06:00 |
|
grossmj
|
5a76f81271
|
Refactoring to use a common node class for all VMs and other (future) objects.
|
2016-05-11 11:35:36 -06:00 |
|
Julien Duponchelle
|
9dca7dfe4a
|
Merge branch '1.5' into 2.0
|
2016-05-10 17:51:40 +02:00 |
|
Julien Duponchelle
|
98b32cd9e2
|
Merge branch '1.5' into 2.0
|
2016-05-02 16:59:56 +02:00 |
|
Julien Duponchelle
|
58d4a529d4
|
Rename hypervisor to compute
Fix #487
|
2016-04-15 17:59:59 +02:00 |
|