Rohit Yadav cc72e4da64 systemvm: Fix regression from 825935 ...

Fixes merge conflict issue incorrectly fixed during a fwd-merge in 825935
from PR #1766

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

2016-11-27 15:43:10 +05:30

..

bindir

Move the system vm to a separate maven project.

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

certs

Move the system vm to a separate maven project.

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

conf

CLOUDSTACK-9062: Improve S3 implementation.

2015-11-19 15:29:10 +01:00

conf.dom0

CLOUDSTACK-9105: Logging enhancement: Handle/reference to track API calls end to end in the MS logs

2015-12-04 12:45:57 +05:30

css

console-proxy add support of AltGr key and FR azerty keyboard

2014-12-08 18:05:43 +05:30

distro

CLOUDSTACK-6220: Take 2, Fix cloudstack init scripts so that they

2014-03-10 16:11:52 -06:00

images

Move the system vm to a separate maven project.

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

js

CLOUDSTACK-9164: Prevent firefox's quick search from opening in VM console

2016-04-25 11:37:43 +05:30

libexec

Move the system vm to a separate maven project.

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

patches/debian

systemvm: Fix regression from 825935

2016-11-27 15:43:10 +05:30

scripts

Add Java Default Certificat Authorities into the keystore if using a custom cert SSL

2016-05-25 06:34:15 +01:00

test/python

Fixed defaultroute on VPC routers in CsRoute and CsAddress

2015-08-24 13:35:29 +02:00

ui

Move the system vm to a separate maven project.

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

vm-script

Move the system vm to a separate maven project.

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

pom.xml

Adds support for four position versions and optional db upgrades

2016-08-30 13:32:32 +05:30

systemvm-descriptor.xml

Remove duplicate scripts and move the remaining items to the systemvm project

2013-10-14 08:02:35 +02:00