Introduce POM dependency on VSphere 5.1 SDK, not done yet, WIP.
Merge branch 'master' into vim51_win8
Upgrade to use Vsphere 5.1 SDK jar, fixed all compilation error with new
wrapper class VmwareClient.
Merge branch 'master' into vim51_win8

Conflicts:
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
	pom.xml

Signed-off-by: Min Chen <min.chen@citrix.com>
Merge branch 'master' into vim51_win8
Fix cast error from List<?> to array.
Merge branch 'master' into vim51_win8

Conflicts:
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java

Signed-off-by: Min Chen <min.chen@citrix.com>
Fix a bug in converting Enum type to String.
Fix ClassCastException.
Merge branch 'master' into vim51_win8
Fix a bug in register template, cannot find template adapter.
Add new windows 8 guest os entries to DB.
Docs: Fixed typo in nicira plugin guide
CLOUDSTACK-1272: Fix incorrect annotation for service offering id

Fixes param annotation in:
   api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java
   api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
   api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
maven: Fix stray characted in client/pom.xml introduced in 4572bc06

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
rat: Fix license for file from recent ui-plugins merge

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
Summary: Adjust systemvm.iso path for KVM, due to packaging changes

Detail: Removing references to /usr/lib/cloud and /usr/lib64/cloud so that old
systemvm.iso files aren't found by accident. systemvm.iso should exist in
/usr/share/cloudstack-common/vms now.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360860243 -0700
CLOUDSTACK-1277: populating transit password field to UserVmJoinVO in
converting from UserVm to UserVmJoinVO.
CLOUDSTACK-1219, CLOUDSTACK-1220: Fix IPv6 error messages
Summary: centos63/package.sh, slightly better version parsing

Description: current package.sh fails if user hasn't downloaded all maven poms
prior to running package.sh. Now we match for something that vaguely resembles
a cloudstack version.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360889840 -0700