Alena Prokharchyk 516cfb5300 CS-15999: added nics to domain router api response ... Conflicts: server/src/com/cloud/api/ApiResponseHelper.java		2012-08-16 16:40:16 -07:00
..
conf	License header updates for the server folder.	2012-08-03 09:41:27 -04:00
scripts	License header updates for the server folder.	2012-08-03 09:41:27 -04:00
src/com/cloud	CS-15999: added nics to domain router api response	2012-08-16 16:40:16 -07:00
test	Fixed unittest for VPC - added missing implementation for some methods in Mock classes used by the test	2012-08-15 14:08:45 -07:00
.classpath	CS-15875 resolved via patch from Andy Gross.	2012-08-07 14:10:11 -04:00
.project	License header updates for the server folder.	2012-08-03 09:41:27 -04:00