cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [34/34] git commit: updated refs/heads/ui-restyle to 23093ed
Date Thu, 26 Sep 2013 18:03:35 GMT
Merge branch 'master' into ui-restyle


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

Branch: refs/heads/ui-restyle
Commit: 23093ed05c55ca4ed482fa1a36e0af89c447cfa6
Parents: 13a9235 a45ee74
Author: Brian Federle <brian.federle@citrix.com>
Authored: Thu Sep 26 11:01:56 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Thu Sep 26 11:01:56 2013 -0700

----------------------------------------------------------------------
 api/src/com/cloud/network/Networks.java         |   1 +
 api/src/com/cloud/network/PhysicalNetwork.java  |   3 +-
 .../classes/resources/messages.properties       |  14 +-
 .../classes/resources/messages_de_DE.properties |   4 +
 .../classes/resources/messages_es.properties    |   5 +
 .../classes/resources/messages_fr_FR.properties |   7 +
 .../classes/resources/messages_ja.properties    |   9 +-
 .../classes/resources/messages_ko_KR.properties |   7 +
 .../classes/resources/messages_pt_BR.properties |   7 +
 .../classes/resources/messages_ru_RU.properties |   7 +
 .../classes/resources/messages_zh_CN.properties |   7 +
 client/pom.xml                                  |   5 +
 client/tomcatconf/componentContext.xml.in       |   8 +
 .../virtualnetwork/VirtualRoutingResource.java  |  35 +++
 .../cloudstack/storage/command/CopyCommand.java |   4 +
 .../com/cloud/vm/VirtualMachineManagerImpl.java |   2 -
 .../orchestration/NetworkOrchestrator.java      |  10 +-
 .../orchestration/VolumeOrchestrator.java       |   3 +-
 .../cloud/upgrade/DatabaseUpgradeChecker.java   |   3 -
 .../datastore/db/SnapshotDataStoreDao.java      |   1 +
 .../storage/test/ChildTestConfiguration.java    |  10 +-
 .../test/DirectAgentManagerSimpleImpl.java      |   5 +
 .../storage/test/EndpointSelectorTest.java      |   8 +
 .../test/FakeDriverTestConfiguration.java       |   4 +-
 .../storage/test/MockStorageMotionStrategy.java |  41 ++-
 .../storage/test/SnapshotTestWithFakeData.java  | 193 ++++++++++++-
 .../test/resource/fakeDriverTestContext.xml     |   6 +-
 .../storage/snapshot/SnapshotObject.java        |   2 +-
 .../snapshot/XenserverSnapshotStrategy.java     |  79 ++++--
 .../image/db/SnapshotDataStoreDaoImpl.java      |  17 +-
 .../storage/datastore/PrimaryDataStoreImpl.java |   6 +
 .../storage/volume/VolumeServiceImpl.java       |  10 +-
 plugins/hypervisors/kvm/pom.xml                 |   1 -
 .../kvm/src/com/cloud/ha/KVMInvestigator.java   |  14 +-
 .../kvm/resource/BridgeVifDriver.java           |  71 +++--
 .../kvm/resource/LibvirtComputingResource.java  |  70 +++--
 .../kvm/storage/KVMStoragePoolManager.java      | 100 ++++++-
 .../kvm/storage/KVMStorageProcessor.java        | 112 ++++----
 .../kvm/storage/LibvirtStorageAdaptor.java      |  80 ++----
 .../kvm/storage/LibvirtStoragePool.java         |  32 ++-
 .../hypervisor/kvm/storage/StorageAdaptor.java  |   4 +-
 .../apache/cloudstack/utils/qemu/QemuImg.java   |  11 +-
 .../resource/LibvirtComputingResourceTest.java  |  15 +
 .../cloudstack/utils/qemu/QemuImgTest.java      |  20 +-
 plugins/network-elements/vxlan/pom.xml          |  29 ++
 .../network/guru/VxlanGuestNetworkGuru.java     | 179 ++++++++++++
 .../network/guru/VxlanGuestNetworkGuruTest.java | 274 +++++++++++++++++++
 plugins/pom.xml                                 |   1 +
 .../CloudStackPrimaryDataStoreDriverImpl.java   |  57 +++-
 pom.xml                                         |   2 +-
 python/lib/cloudutils/serviceConfig.py          |   3 +-
 scripts/storage/qcow2/managesnapshot.sh         |   4 +-
 .../hypervisor/xenserver/xcposs/vmopsSnapshot   |  16 +-
 scripts/vm/network/vnet/modifyvxlan.sh          | 230 ++++++++++++++++
 .../configuration/ConfigurationManagerImpl.java |  37 +--
 .../com/cloud/network/NetworkServiceImpl.java   |   5 +
 .../com/cloud/storage/StorageManagerImpl.java   |   4 +
 .../com/cloud/storage/VolumeApiServiceImpl.java |   2 +-
 .../storage/snapshot/SnapshotManagerImpl.java   |  27 +-
 .../com/cloud/template/TemplateManagerImpl.java |  56 ++--
 .../src/com/cloud/user/AccountManagerImpl.java  |   2 +-
 .../configuration/ConfigurationManagerTest.java |  68 +++++
 setup/db/db/schema-410to420.sql                 |   4 +
 tools/marvin/marvin/deployAndRun.py             |  32 ++-
 ui/dictionary.jsp                               |  11 +
 ui/scripts/docs.js                              |  16 ++
 ui/scripts/sharedFunctions.js                   |   5 +-
 ui/scripts/system.js                            |   8 +-
 ui/scripts/ui-custom/zoneWizard.js              |   6 +-
 69 files changed, 1784 insertions(+), 347 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/23093ed0/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/23093ed0/ui/dictionary.jsp
----------------------------------------------------------------------


Mime
View raw message