cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [25/25] git commit: updated refs/heads/bvt to 5727bd0
Date Fri, 29 Mar 2013 12:46:27 GMT
Merge branch 'master' into bvt


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

Branch: refs/heads/bvt
Commit: 5727bd0eac086e653ec34bb6a17e9337da6deecc
Parents: 1ae4d7f 690c312
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Fri Mar 29 18:10:14 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Fri Mar 29 18:10:14 2013 +0530

----------------------------------------------------------------------
 api/src/com/cloud/agent/api/ScaleVmCommand.java    |    6 +-
 api/src/com/cloud/configuration/Resource.java      |    7 +-
 api/src/com/cloud/event/EventTypes.java            |    6 +
 api/src/com/cloud/storage/VolumeApiService.java    |    5 +-
 api/src/com/cloud/vm/UserVmService.java            |   16 +-
 api/src/com/cloud/vm/VirtualMachine.java           |    2 +-
 .../user/resource/UpdateResourceCountCmd.java      |    6 +-
 .../user/resource/UpdateResourceLimitCmd.java      |    6 +-
 .../api/command/user/vm/ListNicsCmd.java           |    2 +-
 .../cloudstack/api/command/user/vm/ScaleVMCmd.java |  110 +++
 .../api/command/user/volume/ResizeVolumeCmd.java   |    3 +-
 .../cloudstack/api/response/AccountResponse.java   |   54 ++-
 .../api/response/ResourceCountResponse.java        |    2 +-
 .../api/response/ResourceLimitResponse.java        |    2 +-
 .../api/command/test/ScaleVMCmdTest.java           |  122 +++
 .../WEB-INF/classes/resources/messages.properties  |    8 +
 client/pom.xml                                     |    5 +
 client/tomcatconf/commands.properties.in           |    1 +
 client/tomcatconf/componentContext.xml.in          |    2 +
 client/tomcatconf/log4j-cloud.xml.in               |   15 +
 client/tomcatconf/nonossComponentContext.xml.in    |    5 +
 core/src/com/cloud/vm/VMInstanceVO.java            |    2 +-
 engine/api/pom.xml                                 |    4 +
 .../snapshot/strategy/AncientSnapshotStrategy.java |  608 +++++++++++++++
 .../snapshot/strategy/AncientSnasphotStrategy.java |  608 ---------------
 framework/rest/pom.xml                             |    4 +
 packaging/centos63/cloud.spec                      |    3 +-
 plugins/alert-handlers/syslog-alerts/pom.xml       |   40 +
 .../cloudstack/syslog/AlertsSyslogAppender.java    |  336 ++++++++
 .../syslog/AlertsSyslogAppenderTest.java           |   61 ++
 .../manager/BareMetalTemplateAdapter.java          |   15 +-
 .../hypervisor/vmware/VmwareServerDiscoverer.java  |   12 +-
 .../vmware/manager/VmwareManagerImpl.java          |    8 +-
 .../xen/resource/CitrixResourceBase.java           |   82 ++
 .../xen/resource/XenServer56FP1Resource.java       |   11 +-
 .../xen/resource/CitrixResourceBaseTest.java       |  148 ++++
 plugins/pom.xml                                    |    1 +
 .../xenserver/Add-To-VCPUs-Params-Live.sh          |   33 +
 scripts/vm/hypervisor/xenserver/vmops              |   13 +
 .../cloud/agent/manager/ClusteredAgentAttache.java |   13 +-
 server/src/com/cloud/alert/AlertManagerImpl.java   |    3 +-
 server/src/com/cloud/api/ApiResponseHelper.java    |  149 +++-
 .../cloud/api/query/dao/AccountJoinDaoImpl.java    |   18 +
 .../src/com/cloud/api/query/vo/AccountJoinVO.java  |   54 ++
 server/src/com/cloud/configuration/Config.java     |    8 +-
 .../router/VirtualNetworkApplianceManagerImpl.java |   15 +-
 .../resourcelimit/ResourceLimitManagerImpl.java    |   97 ++-
 .../src/com/cloud/server/ManagementServerImpl.java |    2 +
 server/src/com/cloud/storage/VolumeManager.java    |    3 +-
 .../src/com/cloud/storage/VolumeManagerImpl.java   |   95 ++-
 server/src/com/cloud/storage/dao/SnapshotDao.java  |   12 +-
 .../src/com/cloud/storage/dao/SnapshotDaoImpl.java |   65 +-
 server/src/com/cloud/storage/dao/VolumeDao.java    |   66 +-
 .../src/com/cloud/storage/dao/VolumeDaoImpl.java   |   48 +-
 .../cloud/storage/download/DownloadListener.java   |   62 ++-
 .../storage/download/DownloadMonitorImpl.java      |   56 ++-
 .../storage/snapshot/SnapshotManagerImpl.java      |   70 +-
 .../cloud/template/HypervisorTemplateAdapter.java  |   29 +-
 .../com/cloud/template/TemplateManagerImpl.java    |   47 +-
 server/src/com/cloud/user/AccountManagerImpl.java  |    2 +
 server/src/com/cloud/vm/ItWorkVO.java              |    3 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java     |  107 +++-
 server/src/com/cloud/vm/VirtualMachineManager.java |   12 +
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |  311 +++++++-
 .../gslb/GlobalLoadBalancingRulesServiceImpl.java  |    8 +-
 .../ResourceLimitManagerImplTest.java              |   18 +-
 .../test/com/cloud/vm/MockUserVmManagerImpl.java   |   17 +-
 .../cloud/vm/MockVirtualMachineManagerImpl.java    |   17 +
 server/test/com/cloud/vm/UserVmManagerTest.java    |  192 +++++-
 .../cloud/vm/VirtualMachineManagerImplTest.java    |  208 +++++
 .../cloud/vpc/MockResourceLimitManagerImpl.java    |    8 +
 .../networkoffering/CreateNetworkOfferingTest.java |    6 -
 setup/db/db/schema-40to410.sql                     |   31 +-
 setup/db/db/schema-410to420.sql                    |  153 ++++-
 test/integration/smoke/test_ScaleVm.py             |  221 ++++++
 ui/dictionary.jsp                                  |    8 +
 ui/scripts/accounts.js                             |  137 +++-
 ui/scripts/domains.js                              |   92 +++
 ui/scripts/instanceWizard.js                       |   60 ++-
 ui/scripts/projects.js                             |   20 +-
 ui/scripts/storage.js                              |    8 +-
 ui/scripts/system.js                               |    8 +-
 ui/scripts/vpc.js                                  |   87 ++
 utils/src/com/cloud/utils/UriUtils.java            |   33 +
 84 files changed, 4038 insertions(+), 1015 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5727bd0e/client/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5727bd0e/client/tomcatconf/componentContext.xml.in
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5727bd0e/plugins/pom.xml
----------------------------------------------------------------------


Mime
View raw message