Alena Prokharchyk a39fd61249 Merge branch 'master' into vpc ...

Conflicts:
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineGuru.java

2012-07-27 13:47:46 -07:00

..

src/com/cloud

Merge branch 'master' into vpc

2012-07-27 13:47:46 -07:00

.classpath

Use exports for jar dependecy

2011-02-01 11:10:37 -08:00

.project

Source code committed

2010-08-11 09:13:29 -07:00