grossmj 52f7715d6b Merge remote-tracking branch 'origin/master' ...

Conflicts:
	devices/cumulus-vx.json

2015-08-05 15:10:44 -06:00

..

arista-veos.json

Drop graphics since we have vnc support it's no longer require

2015-08-05 18:37:26 +02:00

cumulus-vx.json

Update Cumulus VX json.

2015-08-05 15:09:49 -06:00

hp-vsr1001.json

Cumulus support, console_type support

2015-08-05 12:08:08 +02:00

microcore-linux.json

Drop graphics since we have vnc support it's no longer require

2015-08-05 18:37:26 +02:00