grossmj
|
90ce6093d8
|
Some spring cleaning.
|
2018-03-15 14:17:39 +07:00 |
|
grossmj
|
88674455a3
|
Merge branch '2.1' into 2.2
# Conflicts:
# gns3server/version.py
# tests/compute/docker/test_docker_vm.py
|
2018-03-14 18:40:37 +07:00 |
|
ziajka
|
148baaf465
|
Back to development on v2.1.5dev1
|
2018-03-12 11:27:02 +01:00 |
|
ziajka
|
aaac2a2d93
|
Fix issue with temporary travis deploy issues
|
2018-03-12 09:43:57 +01:00 |
|
ziajka
|
e54a94240d
|
Re-release v2.1.4
|
2018-03-12 09:40:42 +01:00 |
|
ziajka
|
4ca216b181
|
Development on v2.1.5dev1
|
2018-03-12 09:26:07 +01:00 |
|
ziajka
|
e417ee8fed
|
Release v2.1.4
|
2018-03-12 09:19:18 +01:00 |
|
grossmj
|
658aa4bae9
|
Merge 2.1 into 2.2 branch
|
2018-03-12 13:38:50 +07:00 |
|
grossmj
|
3201a996ed
|
Add Juniper JunOS space appliance.
|
2018-03-11 23:02:43 +07:00 |
|
grossmj
|
1df03d052f
|
Sync checkpoint gaia appliance template.
|
2018-03-09 15:41:17 +07:00 |
|
grossmj
|
da31358a65
|
Sync appliance templates.
|
2018-03-09 15:26:40 +07:00 |
|
grossmj
|
0bd7736460
|
Make sure we use an IPv4 address in the remote install script.
|
2018-03-08 21:09:00 +07:00 |
|
grossmj
|
38f458db7c
|
Delete old pcap file when starting a new packet capture.
|
2018-03-08 16:00:05 +07:00 |
|
grossmj
|
233e41d006
|
Fix export project test.
|
2018-03-08 00:39:08 +07:00 |
|
grossmj
|
22db13d2bf
|
Fix bug preventing to export portable projects with IOU images.
|
2018-03-08 00:13:35 +07:00 |
|
grossmj
|
0fde1cf54a
|
Ignore invalid BPF filters. Ref #1290.
|
2018-03-07 21:37:15 +07:00 |
|
grossmj
|
00e781826b
|
Different approach to handle no data returned by uBridge hypervisors. Fixes #1289.
|
2018-03-07 19:42:19 +07:00 |
|
grossmj
|
7c14e21f4a
|
Different approach to handle no data returned by Dynamips or uBridge hypervisors. Fixes #1289.
|
2018-03-07 19:33:19 +07:00 |
|
grossmj
|
a3a0657502
|
Do not raise exception if Dynamips or uBridge hypervisor don't return data and are still running. Fixes #1289
|
2018-03-07 19:11:34 +07:00 |
|
grossmj
|
3ca4f72b99
|
Fix Dynamips private config not loaded into nvram when starting a router. Fixes #1313.
|
2018-03-07 18:18:51 +07:00 |
|
grossmj
|
d911e82dc4
|
Merge remote-tracking branch 'origin/2.1' into 2.1
|
2018-03-07 16:42:12 +07:00 |
|
grossmj
|
c93d0d8d12
|
Make sure we don't try to read when opening a file in binary more. Fixes #1301.
|
2018-03-07 16:39:04 +07:00 |
|
ziajka
|
2a5f3221b9
|
Merge pull request #1314 from GNS3/pyup-update-pytest-3.4.1-to-3.4.2
Update pytest to 3.4.2
|
2018-03-06 09:24:58 +01:00 |
|
pyup-bot
|
78ea230673
|
Update pytest from 3.4.1 to 3.4.2
|
2018-03-06 04:57:22 +01:00 |
|
ziajka
|
53a229f8e9
|
Fix never reached condition
|
2018-03-05 11:16:03 +01:00 |
|
ziajka
|
419797dd92
|
Merge pull request #1312 from GNS3/controller-compat
Compatybility with controller, default_symbol and hover_symbol, Fixes…
|
2018-03-02 13:49:32 +01:00 |
|
ziajka
|
05b6be2e42
|
Compatybility with controller, default_symbol and hover_symbol, Fixes: #2444
|
2018-03-02 13:48:27 +01:00 |
|
ziajka
|
c714c9c8de
|
Merge pull request #1310 from GNS3/fix-1297
Filter snapshots directory during the snapshot, Fixes: #1297
|
2018-02-28 16:40:18 +01:00 |
|
ziajka
|
9be76d98a2
|
Filter snapshots directory during the snapshot, Fixes: #1297
|
2018-02-28 16:38:32 +01:00 |
|
ziajka
|
09c7d73ee9
|
Filter snapshots directory during the snapshot, Fixes: #1297
|
2018-02-28 16:33:20 +01:00 |
|
ziajka
|
9e73ca6620
|
Merge pull request #1309 from GNS3/fix-2420
Handle docker env with last empty line, Fixes: #2420
|
2018-02-27 16:41:24 +01:00 |
|
ziajka
|
e79e27a73f
|
Handle docker env with last empty line, Fixes: #2420
|
2018-02-27 16:33:55 +01:00 |
|
ziajka
|
7beae4e451
|
Merge pull request #1308 from GNS3/pywin32-dep
Pywin32 instead of pypiwin32, Ref. #1276
|
2018-02-27 09:27:54 +01:00 |
|
Jeremy Grossmann
|
a0f2dd374e
|
Require uBridge version 0.9.14 on Linux
|
2018-02-26 23:18:44 +07:00 |
|
ziajka
|
b1657996e3
|
Pywin32 instead of pypiwin32, Ref. #1276
|
2018-02-26 16:25:31 +01:00 |
|
ziajka
|
835bc24b44
|
Merge pull request #1304 from GNS3/pyup-update-sphinx-1.6.6-to-1.7.1
Update sphinx to 1.7.1
|
2018-02-26 09:14:40 +01:00 |
|
Jeremy Grossmann
|
e83ed3b4b5
|
Merge pull request #1295 from ehlers/fix_cpuload
Implement a minimum interval between psutil calls. Fixes #2262
|
2018-02-26 13:08:10 +06:30 |
|
pyup-bot
|
603442509a
|
Update sphinx from 1.6.6 to 1.7.1
|
2018-02-23 19:59:09 +01:00 |
|
ziajka
|
89b352890c
|
Merge pull request #1303 from GNS3/pyup-update-pytest-3.3.2-to-3.4.1
Update pytest to 3.4.1
|
2018-02-21 11:59:38 +01:00 |
|
ziajka
|
56b901a831
|
pytest.ini for ignoring files and recording DEBUG level in tests
|
2018-02-21 11:05:50 +01:00 |
|
ziajka
|
1b3065750d
|
.pytest_cache into .gitignore
|
2018-02-21 10:27:01 +01:00 |
|
ziajka
|
f1d8ee30cd
|
pytest-catchlog merged into the core
|
2018-02-21 10:26:30 +01:00 |
|
ziajka
|
2111f549c9
|
Merge pull request #1302 from nabilbendafi/master
Fix missing 'locales' package in base image
|
2018-02-21 10:14:01 +01:00 |
|
pyup-bot
|
629c7be395
|
Update pytest from 3.3.2 to 3.4.1
|
2018-02-21 03:03:33 +01:00 |
|
Nabil BENDAFI
|
3a15839272
|
Fix missing 'locales' package in base image
`/bin/sh: 1: locale-gen: not found`
|
2018-02-20 16:43:22 +01:00 |
|
Bernhard Ehlers
|
3a09bd43dc
|
Implement a minimum interval between psutil calls. Fixes #2262
|
2018-02-13 11:31:04 +01:00 |
|
grossmj
|
17422bc461
|
Fix appliance loading test (missing category).
|
2018-02-06 16:55:40 +08:00 |
|
grossmj
|
935b8981ea
|
Fix appliance loading test.
|
2018-02-06 16:15:34 +08:00 |
|
grossmj
|
fff593b358
|
Fix error when appliance template is broken (missing fields). Fixes #1287.
|
2018-02-06 16:07:23 +08:00 |
|
grossmj
|
abbe3d3a31
|
Fix "Change of linked base VM doesn't work with templates migrated from 2.0"
|
2018-02-05 16:42:29 +08:00 |
|