cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From isaacchi...@apache.org
Subject [2/2] git commit: updated refs/heads/master to 11f134c
Date Wed, 24 Jul 2013 08:39:29 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack


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

Branch: refs/heads/master
Commit: 11f134c2466ab912d48288ad9e8971b69aca53c8
Parents: 06d8974 dabea9d
Author: Isaac Chiang <isaacchiang@gmail.com>
Authored: Wed Jul 24 16:38:41 2013 +0800
Committer: Isaac Chiang <isaacchiang@gmail.com>
Committed: Wed Jul 24 16:38:41 2013 +0800

----------------------------------------------------------------------
 README.md                                       |    2 +
 api/src/com/cloud/ha/FenceBuilder.java          |   31 +
 api/src/com/cloud/ha/Investigator.java          |   33 +
 api/src/com/cloud/storage/Volume.java           |    3 +
 api/src/com/cloud/vm/VirtualMachine.java        |   71 +-
 .../classes/resources/messages.properties       |    1 +
 client/tomcatconf/applicationContext.xml.in     |    1 -
 docs/en-US/changed-API-commands-4.2.xml         | 1134 +++++++++++++++++-
 docs/en-US/gsoc-midsummer-ian.xml               |  319 ++++-
 docs/en-US/gsoc-midsummer.xml                   |    4 +-
 .../images/add-ldap-configuration-failure.png   |  Bin 0 -> 27841 bytes
 docs/en-US/images/add-ldap-configuration.png    |  Bin 0 -> 27393 bytes
 .../delete-ldap-configuration-failure.png       |  Bin 0 -> 29262 bytes
 docs/en-US/images/delete-ldap.png               |  Bin 0 -> 27832 bytes
 docs/en-US/images/jenkins-pipeline.png          |  Bin 0 -> 29136 bytes
 docs/en-US/images/ldap-account-addition.png     |  Bin 0 -> 69225 bytes
 docs/en-US/images/ldap-configuration.png        |  Bin 0 -> 33360 bytes
 docs/en-US/images/ldap-global-settings.png      |  Bin 0 -> 31145 bytes
 docs/en-US/images/ldap-list-users.png           |  Bin 0 -> 56047 bytes
 docs/en-US/images/list-ldap-configuration.png   |  Bin 0 -> 30977 bytes
 docs/en-US/removed-api-4.2.xml                  |  144 +++
 docs/en-US/whats-new.xml                        |    2 +
 .../storage/ObjectInDataStoreStateMachine.java  |   26 +-
 .../api/storage/VolumeDataFactory.java          |    4 +
 .../cloud/entity/api/VMEntityManagerImpl.java   |    9 +-
 .../motion/AncientDataMotionStrategy.java       |   34 +-
 .../storage/volume/VolumeDataFactoryImpl.java   |   20 +
 .../cloudstack/storage/volume/VolumeObject.java |    8 +-
 .../storage/volume/VolumeServiceImpl.java       |   36 +-
 .../systemvm/debian/config/root/edithosts.sh    |    8 +-
 .../src/com/cloud/ovm/hypervisor/OvmFencer.java |    7 +-
 .../vmware/src/com/cloud/ha/VmwareFencer.java   |   11 +-
 .../src/com/cloud/ha/VmwareInvestigator.java    |   10 +-
 .../xen/src/com/cloud/ha/XenServerFencer.java   |    7 +-
 .../xen/resource/CitrixResourceBase.java        |    2 +
 .../lb/ElasticLoadBalancerManagerImpl.java      |   10 +-
 .../lb/InternalLoadBalancerVMManagerImpl.java   |   11 +-
 .../InternalLBVMManagerTest.java                |   19 +-
 .../InternalLBVMServiceTest.java                |   17 -
 scripts/vm/hypervisor/xenserver/s3xen           |  144 ++-
 .../com/cloud/agent/manager/AgentAttache.java   |    5 +-
 .../cloud/api/query/dao/VolumeJoinDaoImpl.java  |    4 +-
 .../com/cloud/api/query/vo/VolumeJoinVO.java    |   34 +-
 .../consoleproxy/ConsoleProxyManagerImpl.java   |   25 +-
 .../deploy/dao/PlannerHostReservationDao.java   |    2 +
 .../dao/PlannerHostReservationDaoImpl.java      |   15 +-
 .../com/cloud/ha/CheckOnAgentInvestigator.java  |    8 +-
 server/src/com/cloud/ha/FenceBuilder.java       |   31 -
 .../cloud/ha/HighAvailabilityManagerImpl.java   |   59 +-
 server/src/com/cloud/ha/Investigator.java       |   33 -
 server/src/com/cloud/ha/KVMFencer.java          |    6 +-
 .../ha/ManagementIPSystemVMInvestigator.java    |   12 +-
 server/src/com/cloud/ha/RecreatableFencer.java  |    8 +-
 .../com/cloud/ha/UserVmDomRInvestigator.java    |    9 +-
 .../src/com/cloud/ha/XenServerInvestigator.java |    9 +-
 .../VirtualNetworkApplianceManagerImpl.java     |   16 +-
 .../com/cloud/resource/ResourceManagerImpl.java |   14 +-
 .../cloud/server/ConfigurationServerImpl.java   |    4 +-
 .../com/cloud/server/ManagementServerImpl.java  |   96 +-
 .../com/cloud/servlet/ConsoleProxyServlet.java  |   28 +-
 .../storage/StoragePoolAutomationImpl.java      |   66 +-
 server/src/com/cloud/storage/VolumeManager.java |    6 +-
 .../com/cloud/storage/VolumeManagerImpl.java    |  138 ++-
 .../secondary/SecondaryStorageManagerImpl.java  |   24 +-
 .../storage/snapshot/SnapshotManagerImpl.java   |   16 +-
 .../com/cloud/template/TemplateManagerImpl.java |   39 +-
 .../src/com/cloud/user/AccountManagerImpl.java  |    6 +-
 .../vm/ClusteredVirtualMachineManagerImpl.java  |    8 +-
 .../com/cloud/vm/ReservationContextImpl.java    |   20 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java  |  281 ++++-
 .../src/com/cloud/vm/VirtualMachineManager.java |   33 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java |  282 ++---
 .../com/cloud/vm/VirtualMachineProfileImpl.java |   25 +-
 .../vm/snapshot/VMSnapshotManagerImpl.java      |    6 +-
 server/test/com/cloud/vm/UserVmManagerTest.java |    3 -
 .../cloud/vm/VirtualMachineManagerImplTest.java |  316 ++---
 setup/db/db/schema-410to420.sql                 |  123 +-
 test/integration/component/test_accounts.py     |   14 +-
 test/integration/component/test_asa1000v_fw.py  |    4 +-
 test/integration/component/test_blocker_bugs.py |   18 +-
 test/integration/component/test_egress_rules.py |   76 +-
 .../component/test_netscaler_nw_off.py          |   96 +-
 .../component/test_project_resources.py         |    3 +-
 .../component/test_redundant_router.py          |   73 +-
 .../component/test_redundant_router_cleanups.py |   13 +-
 ...test_redundant_router_deployment_planning.py |   13 +-
 .../test_redundant_router_network_rules.py      |   13 +-
 .../component/test_redundant_router_services.py |    9 +-
 .../component/test_redundant_router_upgrades.py |   10 +-
 test/integration/component/test_routers.py      |   34 +-
 .../component/test_shared_networks.py           |  126 +-
 test/integration/component/test_snapshots.py    |   12 +-
 test/integration/component/test_tags.py         |    2 +-
 test/integration/component/test_volumes.py      |   30 +-
 test/integration/component/test_vpc.py          |   63 +-
 test/integration/component/test_vpc_network.py  |   99 +-
 .../component/test_vpc_network_lbrules.py       |   27 +-
 .../component/test_vpc_network_pfrules.py       |  101 +-
 .../component/test_vpc_network_staticnatrule.py |   30 +-
 .../integration/component/test_vpc_offerings.py |   40 +-
 .../component/test_vpc_vms_deployment.py        |   14 +-
 test/integration/smoke/test_vm_snapshots.py     |    2 +-
 ui/dictionary.jsp                               |    1 +
 ui/index.jsp                                    |    6 +-
 ui/modules/infrastructure/infrastructure.js     |    2 +-
 .../vnmcNetworkProvider/vnmcNetworkProvider.js  | 1073 +++++++++--------
 ui/scripts/system.js                            |   31 +-
 ui/scripts/ui-custom/zoneWizard.js              |    2 +-
 ui/scripts/ui/widgets/detailView.js             |    4 +-
 ui/scripts/ui/widgets/listView.js               |    5 +
 ui/scripts/ui/widgets/multiEdit.js              |    4 +-
 111 files changed, 3925 insertions(+), 2063 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/11f134c2/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/11f134c2/ui/dictionary.jsp
----------------------------------------------------------------------


Mime
View raw message