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
..
acl	…
agent/api	Merge branch 'master' into vpc	2012-07-27 13:47:46 -07:00
alert	…
api	Merge branch 'master' into vpc	2012-07-27 13:47:46 -07:00
async	VPC: intermidiate checkin to Static Routes	2012-06-25 21:00:57 -07:00
capacity	…
cluster	…
configuration	VPC: added "forVpc" parameter to listNetworkOfferings command. If true, the offeirng can be used for vpc networks only	2012-07-03 17:23:40 -07:00
consoleproxy	…
dao	…
dc	…
deploy	…
domain	…
event	CS-6840: Add commands for site-to-site vpn	2012-07-02 16:26:34 -07:00
exception	…
host	Phase 1 of Nicira integration	2012-07-11 17:16:06 -07:00
hypervisor	Plug nic support	2012-06-15 14:07:46 -07:00
network	VPC: CS-15681 - execute VPC related methods only when router is a vpc router	2012-07-24 16:12:13 -07:00
offering	VPC: added one more default network offering for VPC - the one not having LB service	2012-07-17 17:46:17 -07:00
org	…
projects	…
resource	CS-15173: Additional Cluster is allowed to add with the same VSM IPaddress as the previous cluster	2012-06-22 13:31:56 -07:00
serializer	…
server	Removed @author tag from bunch of resources	2012-07-06 17:25:36 -07:00
storage	Merge branch 'master' into vpc	2012-07-27 13:47:46 -07:00
template	…
user	Added getUser API to get user details using API key. Services like S3 can user this API to authenticate. API is admin only.	2012-07-18 14:20:04 -07:00
uservm	…
vm	VPC: CS-15668 - IpAssoc: unplug the nics before pluggning new ones	2012-07-23 16:38:14 -07:00