cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weiz...@apache.org
Subject [50/50] [abbrv] git commit: updated refs/heads/disk_io_throttling to 691bc9d
Date Tue, 18 Jun 2013 07:58:50 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack into disk_io_throttling


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

Branch: refs/heads/disk_io_throttling
Commit: 691bc9d3948c7e921386806b63b2857f8bcb763b
Parents: 3ad2f0f 9e2eeb2
Author: Wei Zhou <w.zhou@leaseweb.com>
Authored: Tue Jun 18 09:45:03 2013 +0200
Committer: Wei Zhou <w.zhou@leaseweb.com>
Committed: Tue Jun 18 09:45:03 2013 +0200

----------------------------------------------------------------------
 api/src/com/cloud/offering/NetworkOffering.java |   4 +-
 .../command/admin/cluster/ListClustersCmd.java  |   8 +-
 .../admin/host/FindHostsForMigrationCmd.java    |   3 +-
 .../api/command/admin/host/ListHostsCmd.java    |   3 +-
 .../admin/network/CreateNetworkOfferingCmd.java |   2 +-
 .../api/command/admin/pod/ListPodsByCmd.java    |   7 -
 .../admin/region/ListPortableIpRangesCmd.java   |   3 +-
 .../admin/systemvm/ListSystemVMsCmd.java        |   7 -
 .../api/command/user/iso/ListIsosCmd.java       |  10 +-
 .../command/user/network/ListNetworksCmd.java   |   7 -
 .../command/user/snapshot/ListSnapshotsCmd.java |  12 +-
 .../command/user/template/ListTemplatesCmd.java |  11 +-
 awsapi/web/web.xml                              |  11 +-
 .../com/cloud/network/HAProxyConfigurator.java  |  22 +-
 docs/en-US/Release_Notes.xml                    |   2 +-
 docs/en-US/configure-package-repository.xml     |   4 +-
 .../management-server-install-db-local.xml      |   8 +
 docs/pot/configure-package-repository.pot       |   4 +-
 .../src/com/cloud/dc/dao/DataCenterDao.java     |   2 +-
 .../src/com/cloud/dc/dao/DataCenterDaoImpl.java |  15 +-
 .../com/cloud/offerings/NetworkOfferingVO.java  |   4 +
 .../com/cloud/storage/dao/VMTemplateDao.java    |   2 +-
 .../cloud/storage/dao/VMTemplateDaoImpl.java    |  21 +-
 .../HypervisorHostEndPointRpcServer.java        |   2 +-
 .../guru/BigSwitchVnsGuestNetworkGuru.java      |   2 +-
 .../cloud/network/guru/OvsGuestNetworkGuru.java |   3 +-
 .../api/query/dao/StoragePoolJoinDaoImpl.java   |  12 +-
 server/src/com/cloud/configuration/Config.java  |   9 +-
 .../configuration/ConfigurationManagerImpl.java |  11 +-
 .../com/cloud/network/NetworkManagerImpl.java   |  70 +++--
 .../com/cloud/network/NetworkServiceImpl.java   |  25 +-
 .../network/guru/ExternalGuestNetworkGuru.java  |   3 +-
 .../cloud/network/guru/GuestNetworkGuru.java    |  11 +-
 .../cloud/server/ConfigurationServerImpl.java   |  25 ++
 .../com/cloud/server/ManagementServerImpl.java  | 100 ++----
 .../com/cloud/storage/StorageManagerImpl.java   |   3 +
 .../src/com/cloud/storage/s3/S3ManagerImpl.java |  10 +-
 .../storage/snapshot/SnapshotManagerImpl.java   |  34 +--
 server/src/com/cloud/vm/UserVmManagerImpl.java  |  70 ++---
 .../resource/NfsSecondaryStorageResource.java   |  19 +-
 setup/db/db/schema-410to420.sql                 |   3 +
 setup/dev/advanced.cfg                          |   3 +-
 test/integration/component/test_blocker_bugs.py | 303 -------------------
 .../component/test_explicit_dedication.py       |   3 -
 .../component/test_implicit_planner.py          |   3 -
 test/integration/component/test_netscaler_lb.py |   2 +-
 .../component/test_redundant_router.py          |   7 -
 .../component/test_shared_networks.py           |   1 +
 test/integration/component/test_snapshots.py    | 247 +++++++++------
 .../component/test_storage_motion.py            |   3 -
 test/integration/component/test_volumes.py      |   3 -
 test/integration/component/test_vpc.py          | 170 ++++-------
 .../component/test_vpc_network_lbrules.py       |   2 +-
 .../component/test_vpc_network_pfrules.py       |   2 +-
 ...deploy_vms_with_varied_deploymentplanners.py |  12 +-
 test/integration/smoke/test_nic.py              |   3 -
 .../integration/smoke/test_portable_publicip.py |   1 -
 test/integration/smoke/test_resource_detail.py  |   3 -
 test/integration/smoke/test_scale_vm.py         |   3 -
 test/integration/smoke/test_vm_life_cycle.py    |   2 +-
 test/integration/smoke/test_volumes.py          |   1 -
 tools/marvin/marvin/cloudstackTestClient.py     |   1 +
 ui/scripts/network.js                           | 125 ++++----
 utils/src/com/cloud/utils/S3Utils.java          |   4 +-
 utils/src/com/cloud/utils/StringUtils.java      |   6 +-
 utils/src/com/cloud/utils/net/NetUtils.java     |   2 +-
 .../src/com/cloud/utils/ssh/SSHKeysHelper.java  |   2 +-
 utils/test/com/cloud/utils/StringUtilsTest.java |   5 +
 .../com/cloud/utils/crypto/RSAHelperTest.java   |  50 +++
 .../test/com/cloud/utils/net/NetUtilsTest.java  |   5 +
 .../com/cloud/utils/ssh/SSHKeysHelperTest.java  |  69 +++++
 71 files changed, 680 insertions(+), 947 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/691bc9d3/server/src/com/cloud/configuration/Config.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/691bc9d3/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/691bc9d3/server/src/com/cloud/storage/StorageManagerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/691bc9d3/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------


Mime
View raw message