You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/04/25 21:24:44 UTC

[35/50] [abbrv] git commit: updated refs/heads/ui-add-remove-nics to e6d9e81

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack


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

Branch: refs/heads/ui-add-remove-nics
Commit: 76e40ba5add5fe23c660b747746945fce1440db7
Parents: c8bfbfd 0c1d268
Author: Pranav Saxena <pr...@citrix.com>
Authored: Thu Apr 25 12:34:10 2013 +0530
Committer: Pranav Saxena <pr...@citrix.com>
Committed: Thu Apr 25 12:34:10 2013 +0530

----------------------------------------------------------------------
 .../com/cloud/agent/api/UnregisterVMCommand.java   |   34 +
 api/src/com/cloud/hypervisor/HypervisorGuru.java   |    9 +
 .../region/ha/GlobalLoadBalancingRulesService.java |    3 +
 .../org/apache/cloudstack/api/ApiConstants.java    |    1 +
 .../command/admin/storage/ListStoragePoolsCmd.java |    7 +
 .../cloudstack/api/command/user/vm/ListVMsCmd.java |   10 +-
 .../api/command/user/volume/ListVolumesCmd.java    |    7 +
 .../api/response/GlobalLoadBalancerResponse.java   |   10 +
 .../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 +++++++--------
 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    |    2 +-
 .../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    |    8 +
 .../src/com/cloud/api/query/QueryManagerImpl.java  |   24 +-
 .../com/cloud/hypervisor/HypervisorGuruBase.java   |    5 +
 server/src/com/cloud/server/Criteria.java          |    1 +
 server/src/com/cloud/vm/UserVmManagerImpl.java     |    1 +
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |   24 +
 .../gslb/GlobalLoadBalancingRulesServiceImpl.java  |   14 +
 .../resource/NfsSecondaryStorageResource.java      |   22 +
 ui/index.jsp                                       |    7 +-
 ui/scripts/instances.js                            |   38 +-
 ui/scripts/regions.js                              |  111 +-
 ui/scripts/storage.js                              |   12 +-
 ui/scripts/system.js                               |   33 +-
 52 files changed, 9010 insertions(+), 5803 deletions(-)
----------------------------------------------------------------------