Alena Prokharchyk 2dc1a286f6 VPC: set networkId to be null for IP address when the last PF/LB rule is removed for it and the IP belongs to VPC ... Conflicts: server/src/com/cloud/network/rules/RulesManagerImpl.java		2012-07-02 17:44:27 -07:00
..
conf	fixing line endings in server	2012-04-07 20:13:10 -04:00
scripts
src/com/cloud	VPC: set networkId to be null for IP address when the last PF/LB rule is removed for it and the IP belongs to VPC	2012-07-02 17:44:27 -07:00
test	Merge branch 'master' into vpc	2012-06-28 17:41:40 -07:00
.classpath	bug 6745: Using UUID instead of integers - for System VM s	2011-11-03 07:33:57 -07:00
.project