Alena Prokharchyk 6420ecbd6f Merge branch 'master' into vpc ... Conflicts: server/src/com/cloud/server/ManagementServerImpl.java		2012-07-24 16:13:06 -07:00
..
agent	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
async	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
cluster	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
keystore	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
network	VPC: when VPC router gets destroyed and recreated, plug public nic for each Vlan where VPC public ips belong to	2012-07-20 17:12:34 -07:00
snapshot	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
storage/dao	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
upgrade	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
user	Fixed broken unittest	2012-07-24 10:30:39 -07:00
utils/db	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
vm	Fixed unittest	2012-07-17 15:50:56 -07:00