Alena Prokharchyk a3d4ee3d87 VPC: CS-15598 - update ipVO object after getting system ip as a part of elastic LB ... Conflicts: server/src/com/cloud/network/NetworkManagerImpl.java server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java		2012-07-16 15:42:36 -07:00
..
conf	fixing line endings in server	2012-04-07 20:13:10 -04:00
scripts	Source code committed	2010-08-11 09:13:29 -07:00
src/com/cloud	VPC: CS-15598 - update ipVO object after getting system ip as a part of elastic LB	2012-07-16 15:42:36 -07:00
test	Merge branch 'master' into vpc	2012-07-13 13:52:58 -07:00
.classpath	bug 6745: Using UUID instead of integers - for System VM s	2011-11-03 07:33:57 -07:00
.project	Fix corrupted eclipse project settings, schema fixes and updated template download url	2010-09-29 18:41:54 -07:00