CLOUDSTACK-737,
         allow to add security group enabled networks in security group enabled zone
CLOUDSTACK-737
     add xenserver support in UI
     only XenServer and KVM clusters are allowed in security enabled zone.
     only shared security enabled networks are allowed in security enabled zone.
 CLOUDSTACK-737
         support multiple NICs in Security group in java side
CLOUDSTACK-737
         Security Group script assume there is only one nic per VM, it is a big task to support multiple NICs, may seperate that as another project
Revert "ApiDiscovery: Discovery apis provided by PluggableServices as well"

This reverts commit 1b9e5c3006b5b9ee6b301d65fc8d81675914c826.

Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
ApiDiscovery: Fix tests and make constructor light weight, let spring run init()

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
CLOUDSTACK-722 - Documentation:Changing the SSL proxy console certificate
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Summary: Add missing ResizeVolumeCommand in VmwareResource.java

Submitted-by: hongtu_zang <hongtu_zang@tcloudcomputing.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com>
Before any database calls are made we need to make sure that encryption
is properly initialized if we have an encrypted db.properties.
If encryption is already initialized we don't need to do it again.
Summary: Make prepare-commit-msg hook more compatible with operating systems

Detail: Was using sed -i, which breaks on Mac

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360170672 -0700
Summary: Fix NPE when calling createFirewallRule

Detail: CreateFirewallRuleCmd.java was returning 'null' for getTrafficType().
Recently, getTrafficType started being used by createIngressFirewallRule.
Changing getTrafficType() to return ingress per Jayapal Reddy.

BUG-ID: CLOUDSTACK-1168
Bugfix-for: master,4.1
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360170916 -0700
Summary: Add default newline after summary in prepare-commit-msg

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360171397 -0700
CLOUDSTACK-1166: cloudstack UI - dashboard - sanitize content before setting it to a HTML element.
Summary: Document the procedure for TCP listening of libvirt on Ubuntu 12.04

Detail: This is now controlled by a variable in /etc/default/libvirt-bin

BUG-ID: CLOUDSTACK-1150
Bugfix-for:
Reviewed-by: Wido den Hollander <wido@widodh.nl>
Reported-by: Logan McNaughton <logan@bacoosta.com>
Signed-off-by: Wido den Hollander <wido@widodh.nl> 1360178633 +0100
Summary: fixup spec file

Remove duplicate entries in the config dir

Fix directory permisisons of some directories

Remove the scripts from the webapp as they are packaged inside the cloudstack-common package
IPv6: CLOUDSTACK-1141: Fix reboot router with IPv6 assigned VM
IPv6: One network can have more than one vlan
Localization:Korean Translation