git commit: bug CS-16112: During unplug nic iptables rules are cleaned up in both cloud_nic.sh and vpc_netusage.sh. Consolidated this code in cloud_nic.sh status CS-16112: resolved fixed

Updated Branches: refs/heads/master 95347d2a5 -> b42a813ff bug CS-16112: During unplug nic iptables rules are cleaned up in both cloud_nic.sh and vpc_netusage.sh. Consolidated this code in cloud_nic.sh status CS-16112: resolved fixed Conflicts: patches/systemvm/debian/config/opt/cloud

git commit: CS-16119: Fix wrong container name of updateVpnCustomerGateway

Updated Branches: refs/heads/master 576f7f6ec -> 95347d2a5 CS-16119: Fix wrong container name of updateVpnCustomerGateway Reviewed-by: Frank Zhang Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/co

git commit: cloudstack 3.0 UI - VPC feature - localize vpc.js (Reviewed-by: Brian)

Updated Branches: refs/heads/master 57d95d27f -> 576f7f6ec cloudstack 3.0 UI - VPC feature - localize vpc.js (Reviewed-by: Brian) Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/576f7f6e Tree

git commit: cloudstack 3.0 UI - VPC feature - fix a bug that shortLabel was not localizable. (Reviewed-by: Brian)

Updated Branches: refs/heads/master 7f6505cd3 -> 57d95d27f cloudstack 3.0 UI - VPC feature - fix a bug that shortLabel was not localizable. (Reviewed-by: Brian) Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator

git commit: cloudstack 3.0 UI - VPC feature - add new translation labels in dictionary.jsp (Reviewed-by: Brian)

Updated Branches: refs/heads/master beb9baf95 -> 7f6505cd3 cloudstack 3.0 UI - VPC feature - add new translation labels in dictionary.jsp (Reviewed-by: Brian) Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-c

git commit: cloudstack 3.0 UI - VPC feature - add new translation labels in messages.properties (Reviewed-by: Brian)

Updated Branches: refs/heads/master 0b31a0af6 -> beb9baf95 cloudstack 3.0 UI - VPC feature - add new translation labels in messages.properties (Reviewed-by: Brian) Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incuba

[1/3] git commit: [ASFCS40]304 -> 305 DB upgrade merge to 302-> 4.0

Updated Branches: refs/heads/master cd0004bb8 -> 0b31a0af6 [ASFCS40]304 -> 305 DB upgrade merge to 302-> 4.0 Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/0b31a0af Tree: http://git-wip-us.a

[2/3] git commit: [ASFCS40]CS-15373: Awsapi port change to 7080.

[ASFCS40]CS-15373: Awsapi port change to 7080. Reviewed-By: Frank Changes: - Changes to deploy awsapi in separate webapps folder and listeining on 7080 port - Revert changes which were done to open 7080 on CloudStack Conflicts: awsapi/conf/cloud-bridge.properties client/tomcatc

[5/6] git commit: Fixed line endings in VirtualNetworkApplianceManagerImpl

Fixed line endings in VirtualNetworkApplianceManagerImpl Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/14dd3f07 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/14dd3f07 D

[4/6] git commit: More logging to lock operations on the network

More logging to lock operations on the network Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7d0ad98c Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7d0ad98c Diff: http:

[1/6] git commit: CS-16111 - DB upgrade; fixed foreign keys names

Updated Branches: refs/heads/master aa5aa30b4 -> cd0004bb8 CS-16111 - DB upgrade; fixed foreign keys names Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/cd0004bb Tree: http://git-wip-us.apa

[3/6] git commit: CS-15304: VR deployment - release the lock for the network once the router entry is allocated (2.2.x behavior) as opposed to releasing it when the router start is completed Reviewed-

CS-15304: VR deployment - release the lock for the network once the router entry is allocated (2.2.x behavior) as opposed to releasing it when the router start is completed Reviewed-by: Frank Zhang Conflicts: server/src/com/cloud/network/NetworkManagerImpl.java server/src/com/c

[2/6] git commit: PublicIpAddress api response: new parameter "associatednetworkname" - the name of the guest network associated with the ip address Reviewed-by: Frank Zhang

PublicIpAddress api response: new parameter "associatednetworkname" - the name of the guest network associated with the ip address Reviewed-by: Frank Zhang Conflicts: api/src/com/cloud/api/ApiConstants.java server/src/com/cloud/api/ApiResponseHelper.java Project: http://git-wip

[1/3] git commit: Split JSP into 2 files

Updated Branches: refs/heads/master 5d94a8de8 -> aa5aa30b4 Split JSP into 2 files Due to file size limit being reached on index.jsp, move dictionary JS into separate file, dictionary.jsp reviewed-by: Jessica Wang Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Comm

git commit: VPC UI: Network ACL: Only show 'acl' tab on detail view

Updated Branches: refs/heads/master b7f920b4c -> 5d94a8de8 VPC UI: Network ACL: Only show 'acl' tab on detail view reviewed-by: jessica Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5d94a8

git commit: CS-16018:Resources tab not displaying the Resource limits in both in default view as well as projects view

Updated Branches: refs/heads/master 3113f32f2 -> b7f920b4c CS-16018:Resources tab not displaying the Resource limits in both in default view as well as projects view Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/inc

git commit: Commit for https://reviews.apache.org/r/6701/

Updated Branches: refs/heads/master 93834ea6c -> 3113f32f2 Commit for https://reviews.apache.org/r/6701/ Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/3113f32f Tree: http://git-wip-us.apach

git commit: CS-16007: Show tier name (associated network name) in place of VM name

Updated Branches: refs/heads/master 3f8d9f6b1 -> 93834ea6c CS-16007: Show tier name (associated network name) in place of VM name reviewed-by: jessica Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstac

git commit: VPC UI: Add hover state to virtual router box

Updated Branches: refs/heads/master 685e59b73 -> 3f8d9f6b1 VPC UI: Add hover state to virtual router box Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/3f8d9f6b Tree: http://git-wip-us.apach

[1/3] git commit: Added a more licensing info.

Updated Branches: refs/heads/master ce54bfa7f -> 685e59b73 Added a more licensing info. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/685e59b7 Tree: http://git-wip-us.apache.org/repos/asf/i

git commit: no idea why this config file keeps disappearing

Updated Branches: refs/heads/master 50ca603d0 -> ce54bfa7f no idea why this config file keeps disappearing Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ce54bfa7 Tree: http://git-wip-us.apa

git commit: debian: Protect agent and management configuration from being overwritten

Updated Branches: refs/heads/master 568cc88c2 -> 50ca603d0 debian: Protect agent and management configuration from being overwritten By adding these files to the *.conffiles file we prevent them from being overwritten by dpkg. We don't want to overwrite these files, since they can contain ve

git commit: CS-15898:Change drop down options in vm tier for vpc

Updated Branches: refs/heads/master 7aa7d6e39 -> 568cc88c2 CS-15898:Change drop down options in vm tier for vpc Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/568cc88c Tree: http://git-wip-u

git commit: CS-16089: Create Template after upgrade from snapshot taken in 2.2.14 was failing since the swift_id was not null but 0 instead. Put a check in the code to check for not null and not 0 swi

Updated Branches: refs/heads/master 20ccb6c1c -> 7aa7d6e39 CS-16089: Create Template after upgrade from snapshot taken in 2.2.14 was failing since the swift_id was not null but 0 instead. Put a check in the code to check for not null and not 0 swift_id to go and download the snapshot from th