Min Chen 3b58a45e04 Merge branch 'master' into rbac.		2014-02-07 13:43:36 -08:00
..
resources/META-INF/cloudstack/contrail	VPC Support for contrail networking	2014-01-30 18:13:48 -08:00
src/org/apache/cloudstack/network/contrail	Fix two NPE exceptions in the Contrail Plugin when contrail is not providing any services on the network.	2014-02-06 16:51:20 +01:00
test	Merge branch 'master' into rbac.	2014-02-07 13:43:36 -08:00
pom.xml	These are additional fixes to make Juniper Contrail plugin work	2014-01-28 08:58:22 +00:00