cloudstack/core/src/com/cloud
Alena Prokharchyk ce9f1afa78 Merge branch 'master' into vpc
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
2012-08-01 19:04:28 -07:00
..
agent CS-15555 : typo 2012-07-27 16:56:40 -07:00
alert License header updates for the core folder from Chip Childers 2012-07-02 09:54:47 -04:00
async License header updates for the core folder from Chip Childers 2012-07-02 09:54:47 -04:00
capacity License header updates for the core folder from Chip Childers 2012-07-02 09:54:47 -04:00
certificate License header updates for the core folder from Chip Childers 2012-07-02 09:54:47 -04:00
configuration License header updates for the core folder from Chip Childers 2012-07-02 09:54:47 -04:00
consoleproxy License header updates for the core folder from Chip Childers 2012-07-02 09:54:47 -04:00
event License header updates for the core folder from Chip Childers 2012-07-02 09:54:47 -04:00
exception License header updates for the core folder from Chip Childers 2012-07-02 09:54:47 -04:00
host License header updates for the core folder from Chip Childers 2012-07-02 09:54:47 -04:00
hypervisor CS-15631 : Support for up to 16 VDIs per VM on XS 6.0 and above 2012-08-01 19:39:30 +05:30
info License header updates for the core folder from Chip Childers 2012-07-02 09:54:47 -04:00
network CS-15713 : remove listen section, when ld is removed 2012-08-01 17:22:34 -07:00
resource License header updates for the core folder from Chip Childers 2012-07-02 09:54:47 -04:00
serializer License header updates for the core folder from Chip Childers 2012-07-02 09:54:47 -04:00
storage Add RBD support for primary storage 2012-07-26 22:22:26 +02:00
user License header updates for the core folder from Chip Childers 2012-07-02 09:54:47 -04:00
vm Merge branch 'master' into vpc 2012-07-03 17:32:50 -07:00