…at reside on their own system (as opposed to the default approach of taking a hypervisor snapshot and then copying it to secondary storage)

…apshot

pep8 fixes for test_routers.py

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>

…lumes.py

fixed pep8 issues

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>

…non-default account users. Show it if the owner of the template is the caller

(cherry picked from commit 42f628c)

…t of the guest ip range.

Signed-off-by: Jayapal <jayapal@apache.org>

…eboot

Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>

…tack UI.

Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade441to450.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
	plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	setup/db/db/schema-441to450.sql
	test/integration/component/test_deploy_vgpu_vm.py
	tools/marvin/marvin/config/test_data.py

A number of BVT tests are not valid for LXC (e.g. migrating a VM), so this patch
ensures they skip if LXC is in use.

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>

Fixes #23

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

…e/pod/cluster view > listView > detailView > add View All link (i.e. "View all Virtual Routers").

…ount view > listView > detailView > add View All link (i.e. "View all Virtual Routers").

…f listView - prefilter() - include original args.context when passing it to prefilter().

…XXXX view > listView > detailView > add View All link > not show "group by XXXXXXX" in select view dropdown.

…XXXX view > listView > detailView > add View All link > show read-only text "group by zone/pod/cluster/account" in select view area.

…g > show generic notification.

…e is automatically deleted after URL expires"

Signed-off-by: sanjeev <sanjeev@apache.org>

…e been blocking for too long if exception is thrown in expunging some unfinished or completed old jobs, this will make some future jobs stuck.

…ted from Snapshot with its corresponding volume removed. Fix it by searching for volumes including removed.

(cherry picked from commit 287ff83)

…ing if CS fail to contact rabbit mq server. This is happening in case of Async API calls.

Signed-off-by: Koushik Das <koushik@apache.org>

This should fix that we can't gather CPU statistics on hypervisors
> Ubuntu 12.04

… unusable.

(cherry picked from commit a2d85c8)

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java

Instead of mapping both dictionary JSP files to separate objects, extend
dictionary2's object onto single 'dictionary' object.

-- The previous approach was causing issues on certain dialogs, which were not
opening due to possible missing labels.

…the database

Revert "CLOUDSTACK-7073: Added domainId field to the user table in order to restrict duplicated users creation on the db level"

This reverts commit 5a96d8e.

Conflicts:
	setup/db/db/schema-440to450.sql

…eDriver interface

…t > details tab > network tab > detail view > execute handlers attached to event 'cloudStack.module.sharedFunctions.addExtraProperties'.

…s attached to event 'cloudStack.module.sharedFunctions.addExtraProperties'.

…hed to event 'cloudStack.module.sharedFunctions.addExtraProperties'.

…ruction of VM before it can be recovered needs to be prevented

…d to event 'cloudStack.module.sharedFunctions.addExtraProperties'.

…n is empty, do not make API call to get physical networks.

…ns_instances.TestInstances/test_15_revert_vm_to_snapshot

…ecute handlers attached to event 'cloudStack.module.sharedFunctions.addExtraProperties'.

…k_rules.py' - Test Cases failing on Simulator due to hardware resources requirement for test execution

…t Cases failing on Simulator due to hardware resources requirement for test execution

… hardware

… only on hardware

…to be run only on hardware

Conflicts:
	framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
	setup/db/db/schema-441to450.sql
	test/integration/component/test_escalations_instances.py
	ui/dictionary2.jsp
	ui/scripts/cloudStack.js