Rohit Yadav 3c429ee6b5 Merge remote-tracking branch 'sbp/feature/persisten-systemvm-redundant-vpc-REBASE' ... This closes #118 Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>		2015-03-17 15:44:57 +05:30
..
resources/META-INF/cloudstack	Contrail Event Interceptor fix	2014-02-10 22:43:38 -07:00
src/org/apache/cloudstack/network/contrail	Vpc redundancy enabled. Including Vpc & Vpc Offering creation. Marvin tests and UI.	2015-03-16 11:38:05 +01:00
test	CLOUDSTACK-5236 : ability to identify where the user is from (ex. LDAP)	2015-03-16 14:53:53 +05:30
pom.xml	CLOUDSTACK-8011: Upgrade maven dependencies	2014-12-04 02:12:51 +05:30