7 Commits

Author	SHA1	Message	Date
grossmj	483431438a	Merge remote-tracking branch 'origin/2.0' into 2.0 ... Conflicts: gns3server/controller/project.py tests/compute/test_project.py tests/controller/test_project.py	2016-05-11 11:41:45 -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	9ccb55206d	Cleanup code for getting the default project directory	2016-05-11 18:42:55 +02: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	1ce576c020	Stream pcap from compute to controller to client	2016-04-22 16:22:03 +02:00
Julien Duponchelle	58d4a529d4	Rename hypervisor to compute ... Fix #487	2016-04-15 17:59:59 +02:00