incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject [3/40] git commit: refs/heads/master - Merge branch 'master' into vim51_win8
Date Tue, 05 Mar 2013 02:09:47 GMT
Merge branch 'master' into vim51_win8


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/8f33229f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/8f33229f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/8f33229f

Branch: refs/heads/master
Commit: 8f33229fc1609e68e9c9027fb131b0c8c00e14a8
Parents: 780ac2a 6a6d93c
Author: Min Chen <min.chen@citrix.com>
Authored: Thu Jan 31 14:04:38 2013 -0800
Committer: Min Chen <min.chen@citrix.com>
Committed: Thu Jan 31 14:04:38 2013 -0800

----------------------------------------------------------------------
 INSTALL.md                                         |    3 +-
 api/src/com/cloud/agent/api/to/FirewallRuleTO.java |   20 +-
 api/src/com/cloud/event/EventTypes.java            |    6 +
 api/src/com/cloud/network/Network.java             |    8 +-
 api/src/com/cloud/network/NetworkProfile.java      |    4 +
 .../network/element/UserDataServiceProvider.java   |    1 +
 .../cloud/network/firewall/FirewallService.java    |    6 +-
 api/src/com/cloud/vm/UserVmService.java            |   31 ++
 .../org/apache/cloudstack/api/ApiConstants.java    |    1 +
 api/src/org/apache/cloudstack/api/BaseCmd.java     |    8 +-
 .../user/firewall/CreateEgressFirewallRuleCmd.java |  341 ++++++++++++
 .../user/firewall/CreateFirewallRuleCmd.java       |    4 +-
 .../user/firewall/CreatePortForwardingRuleCmd.java |    2 +-
 .../user/firewall/DeleteEgressFirewallRuleCmd.java |  120 +++++
 .../user/firewall/ListEgressFirewallRulesCmd.java  |   89 ++++
 .../user/firewall/ListFirewallRulesCmd.java        |    4 +
 .../loadbalancer/CreateLoadBalancerRuleCmd.java    |    2 +-
 .../user/nat/CreateIpForwardingRuleCmd.java        |    2 +-
 .../api/command/user/vm/AddNicToVMCmd.java         |  121 +++++
 .../api/command/user/vm/RemoveNicFromVMCmd.java    |  115 ++++
 .../api/command/user/vm/ResetVMSSHKeyCmd.java      |  151 ++++++
 .../command/user/vm/UpdateDefaultNicForVMCmd.java  |  115 ++++
 .../cloudstack/api/response/FirewallResponse.java  |    7 +
 .../cloudstack/api/response/NicResponse.java       |    3 +
 .../WEB-INF/classes/resources/messages.properties  |    1 +
 client/tomcatconf/commands.properties.in           |   11 +
 client/tomcatconf/server-ssl.xml.in                |    1 -
 .../virtualnetwork/VirtualRoutingResource.java     |   11 +-
 docs/en-US/about-security-groups.xml               |    7 +-
 docs/en-US/admin-alerts.xml                        |    3 +-
 docs/en-US/security-groups-advanced-zones.xml      |   52 ++
 docs/en-US/security-groups.xml                     |    3 +-
 docs/en-US/snapshot-throttling.xml                 |   45 ++
 docs/en-US/using-sshkeys.xml                       |    7 +
 docs/en-US/working-with-snapshots.xml              |    1 +
 .../debian/config/etc/iptables/iptables-router     |    4 +-
 .../debian/config/opt/cloud/bin/ipassoc.sh         |    6 +-
 .../debian/config/root/firewallRule_egress.sh      |  171 ++++++
 .../networkservice/BaremetalUserdataElement.java   |    6 +
 .../hypervisor/vmware/resource/VmwareResource.java |   27 +-
 .../xen/resource/CitrixResourceBase.java           |   10 +-
 .../element/JuniperSRXExternalFirewallElement.java |    1 +
 scripts/network/domr/call_firewall.sh              |   21 +-
 server/src/com/cloud/api/ApiResponseHelper.java    |   13 +-
 server/src/com/cloud/api/ApiServlet.java           |   14 +-
 .../src/com/cloud/api/query/QueryManagerImpl.java  |   12 +-
 .../cloud/api/response/ApiResponseSerializer.java  |    6 +-
 server/src/com/cloud/network/NetworkManager.java   |    4 +-
 .../src/com/cloud/network/NetworkManagerImpl.java  |   87 +++-
 server/src/com/cloud/network/NetworkModelImpl.java |    5 +-
 .../com/cloud/network/dao/FirewallRulesDao.java    |    3 +-
 .../cloud/network/dao/FirewallRulesDaoImpl.java    |   22 +-
 .../network/element/CloudZonesNetworkElement.java  |    6 +
 .../network/element/VirtualRouterElement.java      |   22 +-
 .../network/firewall/FirewallManagerImpl.java      |  189 +++++--
 .../network/lb/LoadBalancingRulesManagerImpl.java  |    7 +-
 .../router/VirtualNetworkApplianceManager.java     |    3 +
 .../router/VirtualNetworkApplianceManagerImpl.java |   70 ++-
 .../com/cloud/network/rules/FirewallManager.java   |    6 +-
 .../com/cloud/network/rules/FirewallRuleVO.java    |   11 +-
 .../com/cloud/network/rules/RulesManagerImpl.java  |    4 +-
 .../network/vpn/RemoteAccessVpnManagerImpl.java    |    4 +-
 .../src/com/cloud/server/ManagementServerImpl.java |    3 +-
 .../src/com/cloud/upgrade/dao/Upgrade40to41.java   |  113 ++++-
 server/src/com/cloud/vm/UserVmManagerImpl.java     |  404 ++++++++++++++-
 server/src/com/cloud/vm/VirtualMachineManager.java |    9 +
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |   98 +++-
 .../com/cloud/network/MockFirewallManagerImpl.java |   79 ++--
 .../com/cloud/network/MockNetworkManagerImpl.java  |   13 +-
 .../test/com/cloud/vm/MockUserVmManagerImpl.java   |   27 +
 .../cloud/vm/MockVirtualMachineManagerImpl.java    |    9 +
 .../test/com/cloud/vpc/MockNetworkManagerImpl.java |   15 +-
 .../vpc/MockVpcVirtualNetworkApplianceManager.java |    5 +
 test/integration/smoke/test_nic.py                 |  351 +++++++++++++
 tools/marvin/marvin/integration/lib/base.py        |   23 +-
 ui/dictionary.jsp                                  |    1 +
 ui/scripts/network.js                              |    4 +-
 ui/scripts/system.js                               |    4 +-
 78 files changed, 2942 insertions(+), 256 deletions(-)
----------------------------------------------------------------------



Mime
View raw message