cloudstack/api/src/com/cloud/offering
Alena Prokharchyk 0a7faa9838 Support for adding private network
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
2012-06-15 14:20:34 -07:00
..
DiskOffering.java committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
NetworkOffering.java Support for adding private network 2012-06-15 14:20:34 -07:00
OfferingManager.java committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
ServiceOffering.java committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00