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/09/30 23:52:30 UTC
[31/31] git commit: updated refs/heads/ui-restyle to ef74127
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/ef741279
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ef741279
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ef741279
Branch: refs/heads/ui-restyle
Commit: ef74127984e9f5850f5e0c8437edcfd31958ec01
Parents: 7289604 1a23d6e
Author: Brian Federle <br...@citrix.com>
Authored: Mon Sep 30 14:51:46 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Mon Sep 30 14:51:46 2013 -0700
----------------------------------------------------------------------
api/src/com/cloud/event/EventTypes.java | 2 +
.../cloud/network/VirtualRouterProvider.java | 4 +-
.../element/VirtualRouterElementService.java | 4 +-
api/src/com/cloud/storage/VolumeApiService.java | 2 +-
.../router/CreateVirtualRouterElementCmd.java | 14 +-
.../command/user/volume/UpdateVolumeCmd.java | 47 +-
.../apache/cloudstack/context/CallContext.java | 2 +-
debian/control | 2 +-
.../cloud/agent/manager/AgentManagerImpl.java | 11 +-
.../manager/ClusteredAgentManagerImpl.java | 19 +-
.../ClusterBasedAgentLoadBalancerPlanner.java | 22 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 10 +-
.../cloud/entity/api/VMEntityManagerImpl.java | 10 +-
.../entity/api/db/dao/EngineClusterDaoImpl.java | 6 +-
.../entity/api/db/dao/EngineHostDaoImpl.java | 2 +-
.../entity/api/db/dao/EngineHostPodDaoImpl.java | 2 +-
.../src/com/cloud/dc/dao/ClusterDaoImpl.java | 8 +-
.../src/com/cloud/dc/dao/HostPodDaoImpl.java | 2 +-
.../dc/dao/StorageNetworkIpAddressDaoImpl.java | 4 +-
.../dc/dao/StorageNetworkIpRangeDaoImpl.java | 19 +-
.../src/com/cloud/domain/dao/DomainDaoImpl.java | 2 +-
.../com/cloud/event/dao/UsageEventDaoImpl.java | 2 +-
.../src/com/cloud/host/dao/HostDaoImpl.java | 273 ++++-----
.../com/cloud/network/dao/NetworkDaoImpl.java | 2 +-
.../com/cloud/network/dao/NetworkOpDaoImpl.java | 2 +-
.../network/dao/NetworkServiceMapDaoImpl.java | 2 +-
.../PhysicalNetworkIsolationMethodDaoImpl.java | 2 +-
.../network/dao/PhysicalNetworkTagDaoImpl.java | 2 +-
.../dao/PhysicalNetworkTrafficTypeDaoImpl.java | 10 +-
.../cloud/network/dao/RouterNetworkDaoImpl.java | 2 +-
.../network/dao/UserIpv6AddressDaoImpl.java | 2 +-
.../network/dao/VirtualRouterProviderDao.java | 10 +-
.../dao/VirtualRouterProviderDaoImpl.java | 10 +-
.../element/VirtualRouterProviderVO.java | 8 +-
.../security/dao/SecurityGroupVMMapDaoImpl.java | 2 +-
.../network/vpc/dao/VpcServiceMapDaoImpl.java | 2 +-
.../offerings/dao/NetworkOfferingDaoImpl.java | 2 +-
.../dao/NetworkOfferingServiceMapDaoImpl.java | 2 +-
.../projects/dao/ProjectAccountDaoImpl.java | 4 +-
.../schema/src/com/cloud/storage/VolumeVO.java | 7 +
.../com/cloud/upgrade/dao/VersionDaoImpl.java | 2 +-
.../com/cloud/user/AccountDetailsDaoImpl.java | 13 +-
.../src/com/cloud/user/dao/AccountDaoImpl.java | 2 +-
.../src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 4 +-
.../affinity/dao/AffinityGroupVMMapDaoImpl.java | 4 +-
.../datastore/db/PrimaryDataStoreDaoImpl.java | 21 +-
.../cache/manager/StorageCacheManagerImpl.java | 61 +-
.../StorageCacheReplacementAlgorithmLRU.java | 64 +--
.../storage/snapshot/SnapshotObject.java | 109 ++--
.../endpoint/DefaultEndPointSelector.java | 30 +-
.../db/TemplatePrimaryDataStoreDaoImpl.java | 26 +-
.../framework/config/impl/ConfigDepotImpl.java | 8 +-
.../db/src/com/cloud/utils/db/GenericDao.java | 4 -
.../src/com/cloud/utils/db/GenericDaoBase.java | 47 +-
.../com/cloud/utils/db/GenericQueryBuilder.java | 176 ++++++
.../cloud/utils/db/GenericSearchBuilder.java | 558 +++++--------------
.../db/src/com/cloud/utils/db/GroupBy.java | 14 +-
.../db/src/com/cloud/utils/db/JoinBuilder.java | 113 ++--
.../db/src/com/cloud/utils/db/QueryBuilder.java | 29 +
.../db/src/com/cloud/utils/db/SearchBase.java | 499 +++++++++++++++++
.../src/com/cloud/utils/db/SearchBuilder.java | 6 +-
.../src/com/cloud/utils/db/SearchCriteria.java | 90 ++-
.../src/com/cloud/utils/db/SearchCriteria2.java | 213 -------
.../cloud/utils/db/SearchCriteriaService.java | 29 -
.../jobs/dao/SyncQueueItemDaoImpl.java | 2 +-
.../jobs/impl/AsyncJobManagerImpl.java | 8 +-
packaging/centos63/cloud-agent.rc | 3 +-
packaging/centos63/cloud.spec | 1 -
packaging/debian/init/cloud-agent | 3 +-
.../acl/StaticRoleBasedAPIAccessChecker.java | 11 +-
.../database/BaremetalDhcpDaoImpl.java | 2 +-
.../baremetal/database/BaremetalPxeDaoImpl.java | 2 +-
.../BareMetalPingServiceImpl.java | 11 +-
.../networkservice/BaremetalDhcpElement.java | 35 +-
.../BaremetalDhcpManagerImpl.java | 20 +-
.../BaremetalKickStartServiceImpl.java | 10 +-
.../networkservice/BaremetalPxeElement.java | 14 +-
.../networkservice/BaremetalPxeManagerImpl.java | 10 +-
.../com/cloud/ovm/hypervisor/OvmDiscoverer.java | 440 +++++++--------
.../com/cloud/ucs/database/UcsManagerDao.java | 2 +-
.../com/cloud/ucs/manager/UcsManagerImpl.java | 34 +-
.../xen/discoverer/XcpServerDiscoverer.java | 54 +-
.../lb/ElasticLoadBalancerManagerImpl.java | 4 +-
.../element/InternalLoadBalancerElement.java | 27 +-
.../lb/InternalLoadBalancerVMManagerImpl.java | 6 +-
.../InternalLbElementServiceTest.java | 8 +-
.../InternalLbElementTest.java | 16 +-
.../cloudstack/ldap/LdapAuthenticator.java | 10 -
.../cloud/server/auth/MD5UserAuthenticator.java | 14 +-
.../server/auth/PlainTextUserAuthenticator.java | 15 -
.../auth/SHA256SaltedUserAuthenticator.java | 11 -
server/src/com/cloud/api/ApiResponseHelper.java | 6 +-
server/src/com/cloud/api/ApiServer.java | 22 +-
.../api/query/dao/DiskOfferingJoinDaoImpl.java | 25 +-
.../configuration/ConfigurationManagerImpl.java | 10 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 19 +-
.../com/cloud/ha/AbstractInvestigatorImpl.java | 18 +-
.../hypervisor/HypervisorGuruManagerImpl.java | 30 +-
.../com/cloud/network/NetworkServiceImpl.java | 17 +-
.../network/StorageNetworkManagerImpl.java | 14 +-
.../network/element/VirtualRouterElement.java | 127 +++--
.../element/VpcVirtualRouterElement.java | 10 +-
.../VirtualNetworkApplianceManagerImpl.java | 8 +-
.../VpcVirtualNetworkApplianceManagerImpl.java | 8 +-
.../com/cloud/resource/ResourceManagerImpl.java | 85 ++-
.../com/cloud/server/ManagementServerImpl.java | 10 +-
.../server/auth/DefaultUserAuthenticator.java | 27 -
.../src/com/cloud/storage/OCFS2ManagerImpl.java | 18 +-
.../com/cloud/storage/StorageManagerImpl.java | 2 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 48 +-
.../secondary/SecondaryStorageManagerImpl.java | 28 +-
.../com/cloud/template/TemplateManagerImpl.java | 10 +-
.../test/com/cloud/api/ApiDispatcherTest.java | 108 ++++
.../maint/test_egress_rules_host_maintenance.py | 290 ++++++++++
.../maint/test_host_high_availability.py | 4 +-
.../component/maint/test_multiple_ip_ranges.py | 337 +++++++++++
test/integration/component/test_egress_rules.py | 12 +-
.../component/test_redundant_router_cleanups.py | 2 +-
test/integration/smoke/test_network.py | 12 +-
tools/marvin/marvin/integration/lib/base.py | 10 +-
tools/marvin/marvin/integration/lib/common.py | 16 +
.../demo/simulator/testcase/libs/base.py | 8 +-
ui/plugins/netapp | 1 -
.../cloud/utils/component/ComponentContext.java | 12 +
.../utils/component/ComponentLifecycle.java | 4 +-
utils/src/com/cloud/utils/component/Named.java | 25 +
.../src/com/cloud/utils/component/Registry.java | 50 ++
.../com/cloud/utils/encoding/URLEncoder.java | 44 +-
.../cloud/utils/encoding/UrlEncoderTest.java | 32 ++
129 files changed, 2992 insertions(+), 1952 deletions(-)
----------------------------------------------------------------------