Merge remote-tracking branch 'origin/master' into resize-root
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/caf9de61 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/caf9de61 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/caf9de61 Branch: refs/heads/resize-root Commit: caf9de61a628d53bb7191cc39491218654365df2 Parents: 5eeee5c fb0b2eb Author: Marcus Sorensen <mar...@betterservers.com> Authored: Tue Mar 4 14:27:10 2014 -0700 Committer: Marcus Sorensen <mar...@betterservers.com> Committed: Tue Mar 4 14:27:10 2014 -0700 ---------------------------------------------------------------------- api/src/com/cloud/network/vpc/VpcService.java | 3 +- api/src/com/cloud/projects/ProjectService.java | 6 +- .../api/BaseListAccountResourcesCmd.java | 12 + .../user/account/AddAccountToProjectCmd.java | 7 +- .../account/DeleteAccountFromProjectCmd.java | 7 +- .../user/address/ListPublicIpAddressesCmd.java | 15 +- .../autoscale/ListAutoScaleVmGroupsCmd.java | 15 +- .../autoscale/ListAutoScaleVmProfilesCmd.java | 13 + .../firewall/ListEgressFirewallRulesCmd.java | 3 +- .../user/firewall/ListFirewallRulesCmd.java | 15 +- .../firewall/ListPortForwardingRulesCmd.java | 15 +- .../ListApplicationLoadBalancersCmd.java | 15 +- .../user/network/ListNetworkACLListsCmd.java | 14 +- .../user/network/ListNetworkACLsCmd.java | 15 +- .../command/user/network/ListNetworksCmd.java | 11 + .../project/UpdateProjectInvitationCmd.java | 8 +- .../api/command/user/vm/ListNicsCmd.java | 13 + .../api/command/user/vm/ListVMsCmd.java | 11 + .../api/command/user/volume/ListVolumesCmd.java | 10 + .../api/command/user/vpc/ListVPCsCmd.java | 17 +- .../user/vpn/ListRemoteAccessVpnsCmd.java | 15 +- .../command/user/vpn/ListVpnConnectionsCmd.java | 15 +- .../command/user/vpn/ListVpnGatewaysCmd.java | 15 +- .../classes/resources/messages.properties | 1 + .../schema/src/com/cloud/vm/dao/NicDaoImpl.java | 1 - .../jobs/impl/AsyncJobManagerImpl.java | 15 +- .../framework/jobs/impl/AsyncJobMonitor.java | 30 +- .../kvm/resource/LibvirtComputingResource.java | 15 +- .../kvm/storage/LibvirtStorageAdaptor.java | 27 +- .../agent/manager/SimulatorManagerImpl.java | 6 +- .../driver/SimulatorImageStoreDriverImpl.java | 6 + .../test/resources/log4j.properties | 2 +- .../com/cloud/api/query/QueryManagerImpl.java | 17 +- .../com/cloud/network/NetworkServiceImpl.java | 23 +- .../cloud/network/as/AutoScaleManagerImpl.java | 11 + .../network/firewall/FirewallManagerImpl.java | 6 + .../cloud/network/rules/RulesManagerImpl.java | 6 + .../network/vpc/NetworkACLServiceImpl.java | 13 + .../com/cloud/network/vpc/VpcManagerImpl.java | 7 +- .../network/vpn/RemoteAccessVpnManagerImpl.java | 2 + .../network/vpn/Site2SiteVpnManagerImpl.java | 11 + .../src/com/cloud/projects/ProjectManager.java | 2 +- .../com/cloud/projects/ProjectManagerImpl.java | 34 +- server/src/com/cloud/server/Criteria.java | 1 + .../com/cloud/server/ManagementServerImpl.java | 6 + .../lb/ApplicationLoadBalancerManagerImpl.java | 6 + .../cloud/projects/MockProjectManagerImpl.java | 16 +- .../component/test_multiple_ips_per_nic.py | 405 ++++++++++++++++++- ui/css/cloudstack3.css | 34 +- ui/dictionary.jsp | 3 +- ui/images/infrastructure-icons.png | Bin 62059 -> 66823 bytes ui/images/sprites.png | Bin 209041 -> 210353 bytes ui/index.jsp | 12 +- ui/scripts/instanceWizard.js | 12 +- ui/scripts/zoneWizard.js | 2 +- 55 files changed, 879 insertions(+), 123 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/caf9de61/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java ----------------------------------------------------------------------
