Removed all the extra mockito, inject, and junit dependencies.  Changed any test/resource to test/resources and rely on the master pom to tell us where the resources are instead of each individual project
Added the missing directories
CLOUDSTACK-3857:[Object_Store_Refactor][Usage] Two VOLUME_CREATE usage
events are generated for one data disk after creating and attaching to
VM.
Removed mysql as any dependency
Changed the log4j config files to log org.apache.cloudstack in debug and change the layout format
CLOUDSTACK-3723: System VM Template for XenServer has wrong guest OS type Information on the Database.

This commit also contains the guestOS addition of new CentOS releases
supported by XenServer 6.2

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
CLOUDSTACK-3480: updated the 4.2 templates download location
CLOUDSTACK-3544: Patch to support upgrade to Xenserver 6.2

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
CLOUDSTACK-3874: Adding method to cloud-early-config to allow updation of systemvms log rotation

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
CLOUDSTACK-3480: updated md5 checksum
CLOUDSTACK-3834: 3.0.6 to ASF 4.2 Upgrade: "cloud" Database Schema
Inconsistencies on the Upgraded Setup - Table "netscaler_pod_ref"

adding netscaler_pod_ref table 3.0.7 to 4.1 upgrade path
Update xml file of gsoc summer review

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
update midterm review
CLOUDSTACK-3703: change service offering of stopped vm on

Conflicts:
	server/test/com/cloud/vm/UserVmManagerTest.java
CLOUDSTACK-2882: Additional device types for IDE/SCSI

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit b39d302888f965c5c26812b556c2dc395c53bb5c)
CLOUDSTACK-2882: We are mounting an ISO not a volume

So fdisk -l doesn't list the mounted iso. Instead use showmount -e to
find the mounted device.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 93f79e1a158cb1f69915a4036f5c1840a38c5e53)
COUDSTACK-3053 Template creation from snapshot is failing on VMware setup

Fixed snapshot vmdk file path while copying snapshot files to template path.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
CLOUDSTACK-3879 [VMware] NPE while attempting to create template from volume

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
CLOUDSTACK-3814 Duplicate entry for CPU, Public ip address in dashboard

Changes:
- ListCapacity API was searching the capacities per zone, pod and cluster causing duplicates to end up in th result.
- Instead we should group by zone if zone and pod both are null. Group by pod if zone is provided but no pod. Or group by cluster when zone and pod both are provided.
Fix simulator and marvin

- Remove additional parantheses in marvin VirtualMachine.create(
- Implement createEntityExtractUrl command for simulator

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 908df7aabdd7bfca1d0a3c1b39a83111b61ee692)