Updated Branches: refs/heads/master 00b2a8040 -> caece1282
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/caece128 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/caece128 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/caece128 Branch: refs/heads/master Commit: caece1282345612ead480a0badc9b5109cc4c1bb Parents: 531cfa7 00b2a80 Author: Pranav Saxena <[email protected]> Authored: Mon Aug 13 13:12:38 2012 +0530 Committer: Pranav Saxena <[email protected]> Committed: Mon Aug 13 13:12:38 2012 +0530 ---------------------------------------------------------------------- .../com/cloud/resource/SimulatorDiscoverer.java | 6 +- .../com/cloud/agent/api/GetHostStatsAnswer.java | 4 - api/src/com/cloud/agent/api/HostStatsEntry.java | 4 - .../cloud/agent/api/ModifyStoragePoolAnswer.java | 4 - api/src/com/cloud/agent/api/RebootCommand.java | 4 - api/src/com/cloud/agent/api/StartupAnswer.java | 4 - api/src/com/cloud/agent/api/VmStatsEntry.java | 4 - .../cloud/agent/api/storage/DownloadCommand.java | 4 - .../agent/api/storage/DownloadProgressCommand.java | 4 - api/src/com/cloud/alert/Alert.java | 4 - api/src/com/cloud/capacity/Capacity.java | 4 - .../exception/InvalidParameterValueException.java | 4 - .../cloud/exception/ManagementServerException.java | 4 - .../cloud/exception/PermissionDeniedException.java | 4 - .../cloud/exception/ResourceInUseException.java | 4 - api/src/com/cloud/host/HostStats.java | 4 - .../com/cloud/network/security/SecurityRule.java | 4 - api/src/com/cloud/storage/GuestOsCategory.java | 4 - api/src/com/cloud/storage/StoragePool.java | 5 - .../storage/VMTemplateStorageResourceAssoc.java | 4 - .../com/cloud/bridge/io/FileRangeDataSource.java | 3 - .../com/cloud/bridge/io/FileRangeInputStream.java | 3 - .../bridge/io/MTOMAwareResultStreamWriter.java | 1 - .../cloud/bridge/io/S3FileSystemBucketAdapter.java | 3 - .../bridge/lifecycle/ServiceEngineLifecycle.java | 1 - awsapi/src/com/cloud/bridge/model/MHost.java | 3 - awsapi/src/com/cloud/bridge/model/MHostMount.java | 3 - awsapi/src/com/cloud/bridge/model/SAcl.java | 1 - awsapi/src/com/cloud/bridge/model/SBucket.java | 1 - awsapi/src/com/cloud/bridge/model/SHost.java | 3 - awsapi/src/com/cloud/bridge/model/SMeta.java | 3 - awsapi/src/com/cloud/bridge/model/SObject.java | 3 - awsapi/src/com/cloud/bridge/model/SObjectItem.java | 3 - awsapi/src/com/cloud/bridge/persist/EntityDao.java | 1 - .../cloud/bridge/persist/GMTDateTimeUserType.java | 1 - .../com/cloud/bridge/persist/PersistContext.java | 1 - .../com/cloud/bridge/persist/PersistException.java | 3 - .../src/com/cloud/bridge/persist/dao/MHostDao.java | 3 - .../cloud/bridge/persist/dao/MHostMountDao.java | 3 - .../src/com/cloud/bridge/persist/dao/SAclDao.java | 3 - .../com/cloud/bridge/persist/dao/SBucketDao.java | 3 - .../src/com/cloud/bridge/persist/dao/SHostDao.java | 3 - .../src/com/cloud/bridge/persist/dao/SMetaDao.java | 3 - .../com/cloud/bridge/persist/dao/SObjectDao.java | 3 - .../cloud/bridge/persist/dao/SObjectItemDao.java | 3 - .../service/controller/s3/S3BucketAction.java | 3 - .../service/controller/s3/S3ObjectAction.java | 3 - .../s3/S3SerializableServiceImplementation.java | 2 +- .../service/controller/s3/ServiceProvider.java | 3 - .../service/controller/s3/ServletAction.java | 3 - .../service/core/ec2/EC2AddressFilterSet.java | 4 - .../service/core/ec2/EC2DescribeKeyPairs.java | 4 - .../core/ec2/EC2DescribeKeyPairsResponse.java | 4 - .../service/core/ec2/EC2KeyPairFilterSet.java | 4 - .../service/core/s3/S3AccessControlList.java | 1 - .../service/core/s3/S3AccessControlPolicy.java | 3 - .../bridge/service/core/s3/S3CanonicalUser.java | 3 - .../service/core/s3/S3PutObjectInlineRequest.java | 3 - .../service/core/s3/S3PutObjectInlineResponse.java | 3 - .../bridge/service/core/s3/S3PutObjectRequest.java | 3 - .../service/core/s3/S3PutObjectResponse.java | 3 - .../cloud/bridge/service/core/s3/S3Request.java | 3 - .../bridge/util/CloudStackSessionFactory.java | 4 - .../bridge/util/ISO8601SimpleDateTimeFormat.java | 1 - awsapi/src/com/cloud/bridge/util/XFlatten.java | 3 - .../com/cloud/stack/models/CloudStackKeyPair.java | 4 - cloud-cli/cloudapis/__init__.py | 1 - cloud-cli/cloudtool/__init__.py | 1 - cloud-cli/cloudtool/utils.py | 1 - .../src/com/cloud/consoleproxy/ConsoleProxy.java | 957 +++++++-------- .../com/cloud/consoleproxy/ConsoleProxyClient.java | 107 +- .../cloud/consoleproxy/ConsoleProxyClientBase.java | 876 +++++++------- .../consoleproxy/ConsoleProxyClientParam.java | 189 ++-- .../ConsoleProxyClientStatsCollector.java | 145 ++-- .../cloud/consoleproxy/ConsoleProxyGCThread.java | 183 ++-- .../ConsoleProxyPasswordBasedEncryptor.java | 253 ++-- .../cloud/consoleproxy/ConsoleProxyVncClient.java | 429 ++++---- core/src/com/cloud/host/HostInfo.java | 4 - .../src/com/cloud/network/HAProxyConfigurator.java | 4 - .../cloud/network/LoadBalancerConfigurator.java | 4 - .../com/cloud/storage/StoragePoolHostAssoc.java | 4 - core/src/com/cloud/storage/StoragePoolHostVO.java | 1 - core/src/com/cloud/storage/StoragePoolVO.java | 4 - core/src/com/cloud/storage/UploadVO.java | 4 - core/src/com/cloud/storage/VMTemplateHostVO.java | 1 - .../com/cloud/storage/VMTemplateStoragePoolVO.java | 1 - core/src/com/cloud/storage/VolumeHostVO.java | 1 - .../cloud/storage/template/DownloadManager.java | 4 - .../storage/template/DownloadManagerImpl.java | 4 - .../storage/template/HttpTemplateDownloader.java | 1 - .../cloud/storage/template/TemplateConstants.java | 4 - .../cloud/storage/template/TemplateDownloader.java | 5 - .../cloud/storage/template/TemplateUploader.java | 1 - core/src/com/cloud/user/UserVO.java | 2 - .../kvm/resource/LibvirtCapXMLParser.java | 4 - .../kvm/resource/LibvirtDomainXMLParser.java | 4 - .../scripts/vm/hypervisor/ovm/OvmCommonModule.py | 1 - .../ovm/scripts/vm/hypervisor/ovm/OvmDiskModule.py | 1 - .../vm/hypervisor/ovm/OvmHaHeartBeatModule.py | 1 - .../scripts/vm/hypervisor/ovm/OvmLoggerModule.py | 1 - .../scripts/vm/hypervisor/ovm/OvmObjectModule.py | 1 - .../ovm/scripts/vm/hypervisor/ovm/OvmVifModule.py | 1 - .../ovm/scripts/vm/hypervisor/ovm/OvmVmModule.py | 1 - .../scripts/vm/hypervisor/ovm/OvmVolumeModule.py | 1 - .../cloud/server/auth/MD5UserAuthenticator.java | 1 - .../manager/allocator/impl/TestingAllocator.java | 4 - server/src/com/cloud/server/StatsCollector.java | 2 - .../server/auth/DefaultUserAuthenticator.java | 2 - .../com/cloud/server/auth/UserAuthenticator.java | 1 - .../cloud/storage/download/DownloadListener.java | 1 - .../cloud/storage/download/DownloadMonitor.java | 1 - .../storage/download/DownloadMonitorImpl.java | 5 - .../com/cloud/storage/download/DownloadState.java | 4 - .../cloud/storage/download/NotDownloadedState.java | 4 - .../cloud/storage/monitor/StorageHostMonitor.java | 4 - .../com/cloud/storage/upload/UploadMonitor.java | 1 - .../cloud/storage/upload/UploadMonitorImpl.java | 1 - server/src/com/cloud/user/dao/UserDaoImpl.java | 5 - .../src/com/cloud/sample/UserCloudAPIExecutor.java | 1 - ui/scripts/ui/widgets/dataTable.js | 1 - .../backoff/impl/ConstantTimeBackoffMBean.java | 4 - 121 files changed, 1567 insertions(+), 1890 deletions(-) ----------------------------------------------------------------------
