2 Commits

Author	SHA1	Message	Date
Alena Prokharchyk	31f9d718fb	Merge branch 'master' into vpc ... Conflicts: server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java	2012-07-03 17:32:50 -07:00
Murali reddy	9876d34ea4	moving out ELB network element to plugins/network-elements/elastic-loadbalancer	2012-07-02 15:05:58 -07:00