Daan Hoogland addb26455a Merge release branch 4.7 to master ...

* 4.7:
  CLOUDSTACK-9154 - Sets the pub interface down when all guest nets are gone
  CLOUDSTACK-9187 - Makes code ready for more something like ethXXXX, if we ever get that far
  CLOUDSTACK-9188 -  Reads network GC interval and wait from configDao
  CLOUDSTACK-9187 - Fixes interface allocation to VRRP instances
  CLOUDSTACK-9187 - Adds test to cover multiple nics and nic removal
  CLOUDSTACK-9154 - Adds test to cover nics state after GC
  CLOUDSTACK-9154 - Returns the guest iterface that is marked as added

 Conflicts:
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java

2016-01-17 20:04:11 +01:00

..

resources/META-INF/cloudstack/core

CLOUDSTACK-669: Finalize VM work dispatching mechanism to avoid big switch statement

2014-01-09 14:29:12 -08:00

src

Merge release branch 4.7 to master

2016-01-17 20:04:11 +01:00

test

Refactored Nic.java for readability.

2015-08-18 14:04:48 +02:00

pom.xml

Updating pom.xml version numbers for release 4.8.0-SNAPSHOT

2015-12-21 22:09:31 +01:00