Alena Prokharchyk fe2681fa10 VPC: CS-15725 - don't allow regular offering upgrade to the offering that can be used inside vpc only ... Conflicts: server/src/com/cloud/network/NetworkManagerImpl.java		2012-07-27 13:59:08 -07:00
..
conf	fixing line endings in server	2012-04-07 20:13:10 -04:00
scripts	…
src/com/cloud	VPC: CS-15725 - don't allow regular offering upgrade to the offering that can be used inside vpc only	2012-07-27 13:59:08 -07:00
test	VPC: added vif info to ipassoc command	2012-07-27 13:53:41 -07:00
.classpath	bug 6745: Using UUID instead of integers - for System VM s	2011-11-03 07:33:57 -07:00
.project	…