CLOUDSTACK-4872:VM provisioned using a registered Windows Server 2012
template will show as other os in VCenter.
CLOUDSTACK-4874: added resource tags to the Service offering object. Tags can be created by using createTag API command; you can list service offerings by tags when pass "resourceTag" parameter to the listServiceOfferings call
CLOUDSTACK-2823: This affects Ubuntu as well, since qemu version is 1.0.0
I don't think host kernel version has any bearing on it. Original code
was tested with CentOS 6.3 and 6.4, but it seems to succeed or fail per-host,
e.g. a fast host might work and a slow host might not. I was getting intermittent
failures with ubuntu 12.04.3 prior to this patch.
Regression from Commit: f766a9e58dddfd70c2edc25e018b679a101a1eec Re-commit CLOUDSTACK-2413 - Display the Name of compute offering in dialog box Change Service Offering (was Description field before)

Signed-off-by: Milamber <milamber@apache.org>
CLOUDSTACK-4717: associate IP does not work on shared networks with out
source nat service

relax the restriction that the source nat service should be avaiable in
the network inorder to associate a public ip to the network
CLOUDSTACK-4095 : Remove region_id from Transaction. Read from db.properties whenever required

Conflicts:
	framework/db/src/com/cloud/utils/db/GenericDaoBase.java
Dashboard: Fix wrapping in IE9
CLOUDSTACK-4882:
list Clusters/pods/zones API not accounting for reserved in the used capacity percentage.
Fix listCapacity cmd for reserved as well
Signed off by : nitin mehta<nitin.mehta@citrix.com>
Summary: Updated Ethernet regex for vlan-tagged "p1p1.2" style interfaces

Detail: Checks for other Ethernet interface names uses startsWith(),
whereas the p1p1 style interface uses a regex that doesn't allow for
tailing characters, and so blocks vlan IDs. Fixed.

BUG-ID: CLOUDSTACK-4884
Bugfix-for: 4.2.1
Reviewed-by:
Reported-by:
Signed-off-by: John Kinsella <jlk@stratosec.co> 1381965250 -0700
CLOUDSTACK: 4705 - Fixed memory limits - domain limits test cases. Fixed attribute error

Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
(cherry picked from commit 7854dbc2134a285c2f81b80cf8dfa3047ade50e5)
CLOUDSTACK-4747: Rename testcase name to use lesser characters

Renamed testcase name and also initialised _cleanup so that
it does not break on non-NS Cloudstack setup.

Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
CLOUDSTACK-4682: VMs are getting deployed with shared service offering and local compute offering
VM deployment is fine, issue is in attach volume where all possible scenarios are not handled.
The following needs to be logic of attached volume:
1. if data volume scope is zone then allow attach (this is already there)
2. if data volume scope is cluster
   a. if root volume scope is host, allow if both are in same cluster (already there)
   b. if root volume scope is zone, allow if vm and data volume in same cluster (fixed as part of this commit)
3. if data volume scope is host allow if vm and data volume in same host (fixed as part of this commit)
CLOUDSTACK-4551: Migrating the data volume from NFS to local storage ,underlying disk offering is not changed.
Even though the volume may get migrated from shared to local storage, it is not possible to update the disk offering.
The fix is to disallow migration from shared to local store.
CLOUDSTACK-4766: Add timeout if vm does not reach running state

The tests use to wait for ever for the vm to attain Running state.
Added a timeout so it does not get into infinite loop.

Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
(cherry picked from commit e3bcdc16a11d7452b5bf6ce5e5993dcd008526a6)
CLOUDSTACK-702: Verify Userdata,password services 1.Added two tests to vefiy userdata and password services on alias ip on VR

Conflicts:

	test/integration/component/maint/test_multiple_ip_ranges.py

Signed-off-by: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
Fix systemvm build scripts with the new location of the systemvm patches.

And wondering why they are included here and not in the systemvm.iso.

Also giving the systemvm a little more space to fix the out-of-diskspace error during the build
CLOUDSTACK-3994: fix for Wrong error notification is generated when Primary storage is added with wrong path

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
Rename the definition to we avoid grep problems as grepping for systemvmtemplate would include systemvmtemplate64
Rat and me, the saga continues
CLOUDSTACK-4816:provide configurable option to choose single vs
multipart upload to S3 object storage based on object size.