Daan Hoogland 148efbb73f Merge remote-tracking branch 'origin/4.5' into merge-master ...

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

2014-10-16 12:29:37 +02:00

..

baremetal_snat.sh

Merge remote-tracking branch 'origin/4.5' into merge-master

2014-10-16 12:29:37 +02:00

baremetal-vr.py

CLOUDSTACK-6278

2014-10-06 16:07:51 -07:00

bumpup_priority.sh

CLOUDSTACK-5779: Moving bumpUpPriority, edithosts.sh, dnsmasq.sh to use routeProxy

2014-01-16 16:03:09 -08:00

checkbatchs2svpn.sh

Move the system vm to a separate maven project.

2013-09-20 18:31:02 +08:00

checks2svpn.sh

Move the system vm to a separate maven project.

2013-09-20 18:31:02 +08:00

cloud-nic.sh

Move the system vm to a separate maven project.

2013-09-20 18:31:02 +08:00

createIpAlias.sh

CLOUDSTACK-5779: Move ipAlias to use routerProxy

2014-01-17 12:36:42 -08:00

deleteIpAlias.sh

CLOUDSTACK-7544: Fixed ip addr del issues in ipassoc

2014-09-15 14:54:13 +05:30

dnsmasq.sh

CLOUDSTACK-5779: Moving bumpUpPriority, edithosts.sh, dnsmasq.sh to use routeProxy

2014-01-16 16:03:09 -08:00

edithosts.sh

CLOUDSTACK-3540: Fix edithosts.sh on matching tag

2014-06-27 17:18:38 -07:00

firewall_egress.sh

CLOUDSTACK-5779: Move firewall to use routerProxy

2014-01-17 12:36:42 -08:00

firewall_ingress.sh

CLOUDSTACK-5779: Move firewall to use routerProxy

2014-01-17 12:36:42 -08:00

firewall_nat.sh

CLOUDSTACK-5779: Move firewall to use routerProxy

2014-01-17 12:36:42 -08:00

get_template_version.sh

Move the system vm to a separate maven project.

2013-09-20 18:31:02 +08:00

getRouterAlerts.sh

CLOUDSTACK-6253: Optimizing VR alerts getting algorithm In addition to this a new configuration parameter is added router.alerts.check.interval defaulted to 30minutes to check for alerts in Virtual Router

2014-04-09 18:12:20 +05:30

ilb.sh

CLOUDSTACK-6047: Make VR LB script accept a file name

2014-02-21 18:26:42 -08:00

ipassoc.sh

CLOUDSTACK-7544: Fixed ip addr del issues in ipassoc

2014-09-15 14:54:13 +05:30

ipsectunnel.sh

CLOUDSTACK-730: Site-to-site VPN between VPC VR to VR

2013-10-30 19:30:22 -07:00

loadbalancer.sh

CLOUDSTACK-6047: Make VR LB script accept a file name

2014-02-21 18:26:42 -08:00

monitor_service.sh

CLOUDSTACK-6714: monitor script echo service command is added with quotes

2014-05-20 14:11:19 +05:30

netusage.sh

Move the system vm to a separate maven project.

2013-09-20 18:31:02 +08:00

passwd_server

CLOUDSTACK-7376 passwd_server attempts to start but terminates with the exit code 137

2014-09-17 09:28:44 -07:00

passwd_server_ip

Move the system vm to a separate maven project.

2013-09-20 18:31:02 +08:00

patchsystemvm.sh

Move the system vm to a separate maven project.

2013-09-20 18:31:02 +08:00

prepare_pxe.sh

Merge remote-tracking branch 'origin/4.5' into merge-master

2014-10-16 12:29:37 +02:00

savepassword.sh

CLOUDSTACK-6285: Fix savepassword.sh script for clear out old entries

2014-03-25 15:56:15 -07:00

serve_password.sh

Move the system vm to a separate maven project.

2013-09-20 18:31:02 +08:00

vmdata.py

make virtual router /latest/.htaccess file be static - no longer dynamically generate it, remove code that managed the file previously

2014-09-04 04:22:27 -04:00

vpc_acl.sh

CLOUDSTACK-6062: nic device ids don't always correspond to

2014-02-07 14:59:40 -07:00

vpc_func.sh

Move the system vm to a separate maven project.

2013-09-20 18:31:02 +08:00

vpc_guestnw.sh

CLOUDSTACK-6062: nic device ids don't always correspond to

2014-02-07 14:59:40 -07:00

vpc_ipassoc.sh

Move the system vm to a separate maven project.

2013-09-20 18:31:02 +08:00

vpc_loadbalancer.sh

CLOUDSTACK-6047: Make VR LB script accept a file name

2014-02-21 18:26:42 -08:00

vpc_netusage.sh

Move the system vm to a separate maven project.

2013-09-20 18:31:02 +08:00

vpc_passwd_server

Move the system vm to a separate maven project.

2013-09-20 18:31:02 +08:00

vpc_portforwarding.sh

Move the system vm to a separate maven project.

2013-09-20 18:31:02 +08:00

vpc_privateGateway.sh

Move the system vm to a separate maven project.

2013-09-20 18:31:02 +08:00

vpc_privategw_acl.sh

Fixed vpc private gateway backend issues

2014-05-07 16:33:46 +05:30

vpc_snat.sh

Move the system vm to a separate maven project.

2013-09-20 18:31:02 +08:00

vpc_staticnat.sh

Move the system vm to a separate maven project.

2013-09-20 18:31:02 +08:00

vpc_staticroute.sh

Move the system vm to a separate maven project.

2013-09-20 18:31:02 +08:00

vr_cfg.sh

CLOUDSTACK-6047: Add testing for VR aggregation commands

2014-03-06 16:22:23 -08:00