11 Commits

Author	SHA1	Message	Date
Julien Duponchelle	cb7dbfb256	Merge branch '1.5' into 2.0	2016-06-02 13:47:40 +02:00
grossmj	f2eb2a4bdc	Remove NAT NIO.	2016-05-31 19:06:48 -06:00
grossmj	c1aad550fa	Merge branch '1.5' into 2.0 ... Conflicts: gns3server/version.py	2016-05-29 19:52:15 -06:00
Julien Duponchelle	d5895c3a47	Merge branch '1.5' into 2.0	2016-05-18 11:25:41 +02:00
grossmj	5b604da33a	Make sure nodes send the right notification when started, stopped or suspended.	2016-05-13 20:41:58 -06:00
Julien Duponchelle	5280644327	Return command_line and node_directory via the controller	2016-05-12 10:39:50 +02: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	7390d833ba	Merge branch 'master' into 2.0	2016-04-26 11:50:16 +02:00
Julien Duponchelle	58d4a529d4	Rename hypervisor to compute ... Fix #487	2016-04-15 17:59:59 +02:00