cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [20/49] git commit: updated refs/heads/marvin_refactor to 0b5fe9a
Date Sun, 21 Apr 2013 17:03:31 GMT
Merge branch 'master' into ui-mixed-zone-management


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

Branch: refs/heads/marvin_refactor
Commit: c3009e316b31609f8e8e29b11756593f264afa2b
Parents: 5891f09 5ee3cc4
Author: Brian Federle <brian.federle@citrix.com>
Authored: Wed Apr 17 11:09:01 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Wed Apr 17 11:09:01 2013 -0700

----------------------------------------------------------------------
 api/src/com/cloud/network/NetworkService.java      |    2 +-
 api/src/com/cloud/network/PhysicalNetwork.java     |    5 +-
 api/src/com/cloud/server/ManagementService.java    |    2 -
 .../org/apache/cloudstack/api/ApiConstants.java    |    2 +-
 .../admin/config/ListDeploymentPlannersCmd.java    |   71 ---
 .../admin/network/UpdatePhysicalNetworkCmd.java    |    8 +-
 .../admin/offering/CreateServiceOfferingCmd.java   |    6 -
 .../api/command/user/tag/CreateTagsCmd.java        |    2 +-
 .../api/command/user/tag/DeleteTagsCmd.java        |    2 +-
 .../api/command/user/tag/ListTagsCmd.java          |    2 +-
 client/tomcatconf/applicationContext.xml.in        |    1 -
 docs/en-US/Release_Notes.xml                       |  334 +++++++--------
 docs/en-US/source-build.xml                        |    4 +-
 .../hypervisor/kvm/resource/KVMHAMonitor.java      |   51 +++-
 .../kvm/resource/LibvirtComputingResource.java     |   22 +-
 .../CloudStackPrimaryDataStoreLifeCycleImpl.java   |    3 +-
 server/src/com/cloud/api/ApiResponseHelper.java    |    3 +-
 server/src/com/cloud/configuration/Config.java     |    2 +-
 .../cloud/configuration/ConfigurationManager.java  |    3 +-
 .../configuration/ConfigurationManagerImpl.java    |   19 +-
 server/src/com/cloud/dc/dao/DataCenterVnetDao.java |    6 +
 .../com/cloud/dc/dao/DataCenterVnetDaoImpl.java    |   50 +++-
 .../network/ExternalFirewallDeviceManagerImpl.java |   14 +-
 .../src/com/cloud/network/NetworkServiceImpl.java  |  289 +++++++++----
 .../com/cloud/network/dao/PhysicalNetworkVO.java   |   20 +-
 .../com/cloud/network/guru/GuestNetworkGuru.java   |   14 +-
 .../src/com/cloud/server/ManagementServerImpl.java |   19 -
 .../src/com/cloud/service/ServiceOfferingVO.java   |   23 -
 .../src/com/cloud/storage/StorageManagerImpl.java  |    4 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java     |    5 +
 .../gslb/GlobalLoadBalancingRulesServiceImpl.java  |   11 +
 .../configuration/ConfigurationManagerTest.java    |    4 +-
 .../com/cloud/network/MockNetworkManagerImpl.java  |    2 +-
 .../cloud/network/UpdatePhysicalNetworkTest.java   |   68 +++
 .../cloud/vpc/MockConfigurationManagerImpl.java    |    2 +-
 .../test/com/cloud/vpc/MockNetworkManagerImpl.java |    2 +-
 setup/db/db/schema-410to420.sql                    |    1 -
 test/integration/component/test_accounts.py        |   10 +-
 .../component/test_allocation_states.py            |    2 +-
 test/integration/component/test_blocker_bugs.py    |    8 +-
 test/integration/component/test_egress_rules.py    |   13 +-
 test/integration/component/test_eip_elb.py         |    3 +-
 .../integration/component/test_network_offering.py |    5 +-
 test/integration/component/test_project_configs.py |    6 +-
 test/integration/component/test_project_limits.py  |    4 +-
 .../component/test_project_resources.py            |    7 +-
 test/integration/component/test_project_usage.py   |   10 +-
 test/integration/component/test_projects.py        |    8 +-
 test/integration/component/test_resource_limits.py |    4 +-
 test/integration/component/test_routers.py         |    5 +-
 test/integration/component/test_security_groups.py |    9 +-
 test/integration/component/test_snapshots.py       |    8 +-
 test/integration/component/test_templates.py       |    3 +-
 test/integration/component/test_usage.py           |   10 +-
 .../integration/component/test_vm_passwdenabled.py |    1 +
 test/integration/component/test_volumes.py         |    6 +-
 test/integration/smoke/test_non_contigiousvlan.py  |  125 ++++++
 tools/apidoc/gen_toc.py                            |    1 +
 tools/marvin/marvin/asyncJobMgr.py                 |    2 +-
 tools/marvin/marvin/cloudstackConnection.py        |  238 ++++++-----
 tools/marvin/marvin/cloudstackTestClient.py        |    3 +-
 tools/marvin/marvin/codegenerator.py               |    4 +-
 tools/marvin/marvin/deployDataCenter.py            |    1 -
 tools/marvin/marvin/jsonHelper.py                  |    7 +-
 tools/marvin/setup.py                              |    1 +
 ui/scripts/cloudStack.js                           |    6 +-
 ui/scripts/regions.js                              |  308 ++++++++++++--
 ui/scripts/system.js                               |   52 ++-
 ui/scripts/zoneWizard.js                           |   16 +-
 69 files changed, 1334 insertions(+), 630 deletions(-)
----------------------------------------------------------------------



Mime
View raw message