Commit Graph

5 Commits

Author SHA1 Message Date
Marcus Sorensen c4c9d2d879 Summary: Fixes for api_refactoring
Detail: api_refactoring branch was recently merged into master. This pulls in
those changes and fixes conflicts. Tested to ensure functionality was intact.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1357778902 -0700
2013-01-09 17:48:22 -07:00
Alena Prokharchyk c876a66b3f Fixed unittest 2012-09-11 17:26:20 -07:00
Gavin Lee d3921139ed Patch from Gavin Lee: Change license to ASL2.0 in server and tools
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-08-30 10:36:29 -04:00
Alena Prokharchyk bda1e2d08d VPC: more unittests for VpcService
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-07 11:37:36 -07:00
Alena Prokharchyk cf64fda5d5 VPC: unittest preparation
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-08-07 11:23:52 -07:00