You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ml...@apache.org on 2014/03/08 01:21:00 UTC
[2/3] git commit: updated refs/heads/resize-root to 4a21da6
Merge branch 'resize-root' of https://git-wip-us.apache.org/repos/asf/cloudstack 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/6fc75a9d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6fc75a9d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6fc75a9d
Branch: refs/heads/resize-root
Commit: 6fc75a9d6dfe26c339ae653318d03c20ee360134
Parents: 2508416 caf9de6
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Sun Feb 9 21:20:06 2014 -0700
Committer: Marcus Sorensen <ma...@betterservers.com>
Committed: Sun Feb 9 21:20:06 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(-)
----------------------------------------------------------------------