cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weiz...@apache.org
Subject [44/50] [abbrv] git commit: updated refs/heads/disk_io_throttling to 8b8a0d3
Date Mon, 10 Jun 2013 17:27:38 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/080bb761
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/080bb761
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/080bb761

Branch: refs/heads/disk_io_throttling
Commit: 080bb7618733dff5308165439194c9e152897dbc
Parents: 288c5b6 50dc67b
Author: Wei Zhou <w.zhou@leaseweb.com>
Authored: Mon Jun 10 15:01:53 2013 +0200
Committer: Wei Zhou <w.zhou@leaseweb.com>
Committed: Mon Jun 10 15:01:53 2013 +0200

----------------------------------------------------------------------
 api/src/com/cloud/network/NetworkModel.java     |    2 +
 .../affinitygroup/ListAffinityGroupsCmd.java    |    7 +-
 .../apache/cloudstack/query/QueryService.java   |    3 +-
 docs/en-US/CloudStack_GSoC_Guide.xml            |    3 +-
 docs/en-US/build-rpm.xml                        |    1 +
 docs/en-US/gsoc-dharmesh.xml                    |  149 +++
 docs/en-US/gsoc-meng.xml                        |  235 ++++
 docs/en-US/images/mesos-integration-arch.jpg    |    0
 docs/en-US/pvlan.xml                            |  118 +-
 .../com/cloud/network/dao/IPAddressDaoImpl.java |    1 +
 .../rules/dao/PortForwardingRulesDao.java       |    2 +-
 .../rules/dao/PortForwardingRulesDaoImpl.java   |    9 +-
 .../src/com/cloud/usage/dao/UsageDao.java       |    5 +-
 .../src/com/cloud/usage/dao/UsageDaoImpl.java   |   64 +
 .../storage/volume/VolumeServiceImpl.java       |   79 +-
 .../vmware/resource/VmwareResource.java         |   48 +-
 server/src/com/cloud/api/ApiResponseHelper.java |    4 +-
 .../com/cloud/api/query/QueryManagerImpl.java   |   33 +-
 .../consoleproxy/ConsoleProxyManagerImpl.java   |    7 +
 .../src/com/cloud/network/NetworkModelImpl.java |    5 +-
 .../com/cloud/network/NetworkServiceImpl.java   |   48 +-
 .../cloud/network/rules/RulesManagerImpl.java   |    2 +-
 .../src/com/cloud/user/AccountManagerImpl.java  |    4 +
 .../com/cloud/network/MockNetworkModelImpl.java |    5 +
 .../com/cloud/vpc/MockNetworkModelImpl.java     |    5 +
 test/integration/component/test_accounts.py     |    4 -
 .../component/test_advancedsg_networks.py       |    1 +
 test/integration/component/test_egress_rules.py |    1 -
 test/integration/component/test_eip_elb.py      |    6 -
 test/integration/component/test_netscaler_lb.py |    1 -
 .../component/test_network_offering.py          |    1 -
 .../component/test_project_configs.py           |    2 -
 .../component/test_project_limits.py            |    1 -
 test/integration/component/test_projects.py     |    1 -
 test/integration/component/test_tags.py         |    2 -
 test/integration/component/test_templates.py    |    1 -
 .../component/test_vm_passwdenabled.py          |    1 -
 test/integration/component/test_vpc.py          |    1 -
 test/integration/component/test_vpc_network.py  |  275 ++--
 .../component/test_vpc_network_pfrules.py       |  487 ++++----
 .../integration/component/test_vpc_offerings.py |    2 -
 test/integration/component/test_vpc_routers.py  |    4 -
 .../component/test_vpc_vm_life_cycle.py         | 1181 +++---------------
 .../component/test_vpc_vms_deployment.py        |    1 -
 test/integration/smoke/test_network.py          |    2 +-
 test/integration/smoke/test_routers.py          |    1 -
 .../integration/smoke/test_service_offerings.py |    4 +-
 test/integration/smoke/test_vm_life_cycle.py    |   13 +-
 .../definitions/systemvmtemplate/postinstall.sh |   13 +-
 .../systemvmtemplate64/postinstall.sh           |   15 +-
 ui/scripts/network.js                           |   31 +-
 ui/scripts/system.js                            |    4 +-
 .../cloud/usage/parser/NetworkUsageParser.java  |   11 +-
 .../cloud/usage/parser/VmDiskUsageParser.java   |   43 +-
 utils/src/com/cloud/utils/net/NetUtils.java     |   28 +
 .../test/com/cloud/utils/net/NetUtilsTest.java  |   19 +
 56 files changed, 1434 insertions(+), 1562 deletions(-)
----------------------------------------------------------------------



Mime
View raw message