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
..
WEB-INF	CS-15540: Shared Networks IPs in Advanced Zone appear as 'Direct IP' in System-Wide-Capacity Dashboard	2012-07-24 01:25:05 +05:30
bindir	Bug 9479 - provide option for built in https	2011-09-01 17:09:06 -07:00
distro	cleaning up a few last license headers in client	2012-07-20 14:02:24 -04:00
tomcatconf	Merge branch 'master' into vpc	2012-07-27 13:47:46 -07:00
.classpath	fixed all the broken thirdparty stuff	2011-01-31 10:51:01 -08:00
.project	change client/.project to client not vmopsClient	2011-09-22 13:37:12 -07:00