Merge branch 'master' into marvin_refactor
Conflicts:
tools/marvin/marvin/cloudstackConnection.py
tools/marvin/marvin/cloudstackTestClient.py
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dbcfc666
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dbcfc666
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dbcfc666
Branch: refs/heads/marvin_refactor
Commit: dbcfc66616e35319a89538e4963c839e3af1c8b2
Parents: de716db d61aa6d
Author: Prasanna Santhanam <t...@apache.org>
Authored: Thu Apr 25 20:15:05 2013 +0530
Committer: Prasanna Santhanam <t...@apache.org>
Committed: Thu Apr 25 20:15:05 2013 +0530
----------------------------------------------------------------------
.../com/cloud/agent/api/UnregisterVMCommand.java | 34 +
api/src/com/cloud/hypervisor/HypervisorGuru.java | 9 +
api/src/com/cloud/network/NetworkService.java | 2 +-
.../region/ha/GlobalLoadBalancingRulesService.java | 3 +
.../org/apache/cloudstack/api/ApiConstants.java | 1 +
.../apache/cloudstack/api/ResponseGenerator.java | 4 +-
.../command/admin/storage/ListStoragePoolsCmd.java | 7 +
.../api/command/user/vm/AddIpToVmNicCmd.java | 9 +-
.../cloudstack/api/command/user/vm/ListVMsCmd.java | 10 +-
.../api/command/user/volume/ListVolumesCmd.java | 7 +
.../api/response/GlobalLoadBalancerResponse.java | 10 +
.../api/command/test/AddIpToVmNicTest.java | 6 +-
.../com/cloud/bridge/service/core/s3/S3Engine.java | 2 +-
.../WEB-INF/classes/resources/messages.properties | 4 +
.../classes/resources/messages_ca.properties | 306 ++
.../classes/resources/messages_de_DE.properties | 747 ++++
.../classes/resources/messages_es.properties | 861 +++++
.../classes/resources/messages_it_IT.properties | 618 +++
.../classes/resources/messages_ja.properties | 2909 +++++++-------
.../classes/resources/messages_ko_KR.properties | 2887 +++++++-------
.../classes/resources/messages_nb_NO.properties | 365 ++
.../classes/resources/messages_pt_BR.properties | 2094 +++++------
.../classes/resources/messages_ru_RU.properties | 2892 +++++++--------
.../classes/resources/messages_zh_CN.properties | 2989 +++++++--------
docs/en-US/about-working-with-vms.xml | 85 +-
docs/en-US/append-displayname-vms.xml | 84 +
docs/en-US/creating-network-offerings.xml | 45 +
docs/en-US/delete-event-alerts.xml | 47 +
docs/en-US/elastic-ip.xml | 90 +
docs/en-US/events.xml | 3 +-
docs/en-US/images/add-vlan-icon.png | Bin 0 -> 860 bytes
docs/en-US/network-offerings.xml | 83 +-
docs/en-US/networks.xml | 1 +
docs/en-US/non-contiguous-vlan.xml | 68 +
docs/en-US/set-up-network-for-users.xml | 13 +-
docs/en-US/using-netscaler-load-balancers.xml | 132 +-
docs/en-US/virtual-machines.xml | 1 +
docs/en-US/vlan-provisioning.xml | 2 +
.../debian/config/etc/init.d/cloud-early-config | 14 +-
.../hypervisor/kvm/resource/KVMHAMonitor.java | 7 +-
.../hypervisor/kvm/resource/LibvirtConnection.java | 14 +-
.../kvm/storage/KVMStoragePoolManager.java | 12 +-
.../src/com/cloud/hypervisor/guru/VMwareGuru.java | 9 +
.../hypervisor/vmware/resource/VmwareResource.java | 44 +-
scripts/vm/network/security_group.py | 2 +-
server/src/com/cloud/api/ApiDBUtils.java | 9 +
server/src/com/cloud/api/ApiResponseHelper.java | 40 +-
.../src/com/cloud/api/query/QueryManagerImpl.java | 24 +-
.../com/cloud/hypervisor/HypervisorGuruBase.java | 5 +
.../network/ExternalFirewallDeviceManagerImpl.java | 2 +-
.../src/com/cloud/network/NetworkServiceImpl.java | 19 +-
.../com/cloud/network/guru/GuestNetworkGuru.java | 2 +-
server/src/com/cloud/server/Criteria.java | 1 +
server/src/com/cloud/vm/UserVmManagerImpl.java | 2 +
.../com/cloud/vm/VirtualMachineManagerImpl.java | 24 +
.../gslb/GlobalLoadBalancingRulesServiceImpl.java | 14 +
.../com/cloud/network/MockNetworkManagerImpl.java | 2 +-
.../test/com/cloud/vpc/MockNetworkManagerImpl.java | 2 +-
.../resource/NfsSecondaryStorageResource.java | 22 +
ui/index.jsp | 7 +-
ui/scripts/events.js | 8 +-
ui/scripts/instances.js | 38 +-
ui/scripts/regions.js | 111 +-
ui/scripts/storage.js | 14 +-
ui/scripts/system.js | 33 +-
65 files changed, 10559 insertions(+), 7352 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dbcfc666/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dbcfc666/server/src/com/cloud/network/NetworkServiceImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dbcfc666/ui/scripts/instances.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dbcfc666/ui/scripts/system.js
----------------------------------------------------------------------
