incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahu...@apache.org
Subject [39/50] [abbrv] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Date Wed, 05 Sep 2012 21:31:49 GMT
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/ad577b8a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ad577b8a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ad577b8a

Branch: refs/heads/javelin
Commit: ad577b8a48ef73b26b9e2505fb31dc3b90cf47ac
Parents: 6204ca2 39a676c
Author: David Nalley <david@gnsa.us>
Authored: Fri Aug 31 11:29:24 2012 -0400
Committer: David Nalley <david@gnsa.us>
Committed: Fri Aug 31 11:29:24 2012 -0400

----------------------------------------------------------------------
 .../com/cloud/api/response/ExceptionResponse.java  |   43 +-
 build/deploy/production/db/templates-dev.sql       |   32 +-
 build/developer.xml                                |    6 +
 .../systemvm/debian/config/etc/profile.d/cloud.sh  |   29 +-
 .../config/opt/cloud/bin/get_template_version.sh   |   28 +-
 .../debian/config/opt/cloud/bin/ipassoc.sh         |   30 +-
 .../debian/config/opt/cloud/bin/ipsectunnel.sh     |   28 +-
 .../debian/config/opt/cloud/bin/netusage.sh        |   30 +-
 .../debian/config/opt/cloud/bin/patchsystemvm.sh   |   30 +-
 .../debian/config/opt/cloud/bin/serve_password.sh  |   31 +-
 .../debian/config/opt/cloud/bin/vpc_acl.sh         |   28 +-
 .../debian/config/opt/cloud/bin/vpc_func.sh        |   28 +-
 .../debian/config/opt/cloud/bin/vpc_guestnw.sh     |   28 +-
 .../debian/config/opt/cloud/bin/vpc_ipassoc.sh     |   30 +-
 .../config/opt/cloud/bin/vpc_loadbalancer.sh       |   28 +-
 .../debian/config/opt/cloud/bin/vpc_netusage.sh    |   28 +-
 .../config/opt/cloud/bin/vpc_portforwarding.sh     |   28 +-
 .../config/opt/cloud/bin/vpc_privateGateway.sh     |   28 +-
 .../debian/config/opt/cloud/bin/vpc_snat.sh        |   28 +-
 .../debian/config/opt/cloud/bin/vpc_staticnat.sh   |   28 +-
 .../debian/config/opt/cloud/bin/vpc_staticroute.sh |   28 +-
 .../systemvm/debian/config/root/bumpup_priority.sh |   28 +-
 .../systemvm/debian/config/root/clearUsageRules.sh |   31 +-
 patches/systemvm/debian/config/root/edithosts.sh   |   29 +-
 patches/systemvm/debian/config/root/firewall.sh    |   28 +-
 .../systemvm/debian/config/root/firewall_rule.sh   |   28 +-
 patches/systemvm/debian/config/root/func.sh        |   28 +-
 .../systemvm/debian/config/root/loadbalancer.sh    |   30 +-
 patches/systemvm/debian/config/root/reconfigLB.sh  |   30 +-
 .../config/root/redundant_router/check_bumpup.sh   |   28 +-
 .../config/root/redundant_router/disable_pubip.sh  |   28 +-
 .../root/redundant_router/primary-backup.sh.templ  |   26 +-
 patches/systemvm/debian/config/root/userdata.py    |   31 +-
 patches/systemvm/debian/config/root/userdata.sh    |   30 +-
 .../debian/vpn/opt/cloud/bin/vpc_vpn_l2tp.sh       |   30 +-
 .../systemvm/debian/vpn/opt/cloud/bin/vpn_l2tp.sh  |   30 +-
 patches/systemvm/debian/xe/xe-daemon               |   26 +-
 patches/systemvm/debian/xe/xe-linux-distribution   |   26 +-
 patches/systemvm/debian/xe/xe-update-guest-attrs   |   26 +-
 .../cloud/deploy/UserConcentratedPodPlanner.java   |   28 +-
 .../com/cloud/deploy/UserDispersingPlanner.java    |   28 +-
 .../manager/allocator/impl/RandomAllocator.java    |   28 +-
 .../kvm/resource/LibvirtComputingResource.java     |   46 ++
 .../vmware/src/com/cloud/ha/VmwareFencer.java      |   28 +-
 .../src/com/cloud/ha/VmwareInvestigator.java       |   28 +-
 .../src/com/cloud/hypervisor/guru/VMwareGuru.java  |   28 +-
 .../cloud/hypervisor/vmware/VmwareCleanupMaid.java |   28 +-
 .../hypervisor/vmware/VmwareServerDiscoverer.java  |   28 +-
 .../vmware/manager/VmwareHostService.java          |   28 +-
 .../hypervisor/vmware/manager/VmwareManager.java   |   28 +-
 .../vmware/manager/VmwareManagerImpl.java          |   28 +-
 .../vmware/manager/VmwareStorageManager.java       |   28 +-
 .../vmware/manager/VmwareStorageManagerImpl.java   |   28 +-
 .../vmware/manager/VmwareStorageMount.java         |   28 +-
 .../vmware/resource/VmwareContextFactory.java      |   28 +-
 .../hypervisor/vmware/resource/VmwareResource.java |   28 +-
 .../network/CiscoNexusVSMDeviceManagerImpl.java    |   28 +-
 .../cloud/network/dao/CiscoNexusVSMDeviceDao.java  |   28 +-
 .../network/dao/CiscoNexusVSMDeviceDaoImpl.java    |   30 +-
 .../resource/PremiumSecondaryStorageResource.java  |   28 +-
 .../VmwareSecondaryStorageContextFactory.java      |   28 +-
 .../VmwareSecondaryStorageResourceHandler.java     |   28 +-
 .../xen/src/com/cloud/ha/XenServerFencer.java      |   28 +-
 .../src/com/cloud/hypervisor/XenServerGuru.java    |   28 +-
 .../xen/discoverer/XcpServerDiscoverer.java        |   28 +-
 .../hypervisor/xen/resource/CitrixHelper.java      |   28 +-
 .../xen/resource/CitrixResourceBase.java           |   28 +-
 .../hypervisor/xen/resource/XcpServerResource.java |   28 +-
 .../xen/resource/XenServer56FP1Resource.java       |   28 +-
 .../xen/resource/XenServer56Resource.java          |   28 +-
 .../xen/resource/XenServer56SP2Resource.java       |   28 +-
 .../xen/resource/XenServer600Resource.java         |   28 +-
 .../xen/resource/XenServer602Resource.java         |   28 +-
 .../xen/resource/XenServerConnectionPool.java      |   30 +-
 .../hypervisor/xen/resource/XenServerPoolVms.java  |   28 +-
 .../element/F5ExternalLoadBalancerElement.java     |   28 +-
 .../F5ExternalLoadBalancerElementService.java      |   28 +-
 .../cloud/network/resource/F5BigIpResource.java    |   30 +-
 .../cloud/api/commands/AddExternalFirewallCmd.java |   28 +-
 .../com/cloud/api/commands/AddSrxFirewallCmd.java  |   28 +-
 .../api/commands/ConfigureSrxFirewallCmd.java      |   28 +-
 .../api/commands/DeleteExternalFirewallCmd.java    |   28 +-
 .../cloud/api/commands/DeleteSrxFirewallCmd.java   |   28 +-
 .../api/commands/ListExternalFirewallsCmd.java     |   28 +-
 .../api/commands/ListSrxFirewallNetworksCmd.java   |   28 +-
 .../cloud/api/commands/ListSrxFirewallsCmd.java    |   28 +-
 .../element/JuniperSRXExternalFirewallElement.java |   30 +-
 .../element/JuniperSRXFirewallElementService.java  |   28 +-
 .../cloud/network/resource/JuniperSrxResource.java |   30 +-
 .../src/com/cloud/network/NetScalerPodVO.java      |   27 +-
 .../src/com/cloud/network/dao/NetScalerPodDao.java |   29 +-
 .../com/cloud/network/dao/NetScalerPodDaoImpl.java |   27 +-
 .../cloud/network/element/NetscalerElement.java    |   30 +-
 .../NetscalerLoadBalancerElementService.java       |   28 +-
 .../cloud/network/resource/NetscalerResource.java  |   30 +-
 scripts/network/domr/s2s_vpn.sh                    |   29 +-
 .../src/com/cloud/upgrade/dao/Upgrade30xBase.java  |   26 +-
 .../cloud/vpc/MockConfigurationManagerImpl.java    |   28 +-
 .../test/com/cloud/vpc/MockNetworkManagerImpl.java |   28 +-
 .../cloud/vpc/MockResourceLimitManagerImpl.java    |   28 +-
 .../com/cloud/vpc/MockSite2SiteVpnManagerImpl.java |   28 +-
 server/test/com/cloud/vpc/MockVpcManagerImpl.java  |   28 +-
 server/test/com/cloud/vpc/VpcApiUnitTest.java      |   28 +-
 .../cloud/vpc/dao/MockConfigurationDaoImpl.java    |   28 +-
 .../test/com/cloud/vpc/dao/MockNetworkDaoImpl.java |   28 +-
 .../cloud/vpc/dao/MockNetworkOfferingDaoImpl.java  |   28 +-
 .../dao/MockNetworkOfferingServiceMapDaoImpl.java  |   28 +-
 .../vpc/dao/MockNetworkServiceMapDaoImpl.java      |   28 +-
 server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java  |   28 +-
 .../com/cloud/vpc/dao/MockVpcOfferingDaoImpl.java  |   28 +-
 .../vpc/dao/MockVpcOfferingServiceMapDaoImpl.java  |   28 +-
 .../cloud/vpc/dao/MockVpcVirtualRouterElement.java |   28 +-
 server/test/resources/cleanup.sql                  |   28 +-
 server/test/resources/fake.sql                     |   28 +-
 setup/db/create-schema.sql                         |   28 +-
 setup/db/deploy-db-dev.sh                          |    4 +
 test/conf/templates.sql                            |   30 +-
 tools/ant/apache-ant-1.7.1/bin/runant.py           |   29 +-
 tools/build/addcopyright.py                        |  588 ++++++++-------
 tools/migration/XenAPI.py                          |   42 +-
 tools/migration/share_all_lus.sh                   |   29 +-
 tools/migration/upgrade.py                         |   28 +-
 tools/waf/javadir.py                               |   28 +-
 tools/waf/mkisofs.py                               |   30 +-
 tools/waf/tar.py                                   |   28 +-
 tools/waf/tomcat.py                                |   30 +-
 tools/waf/usermgmt.py                              |   30 +-
 ui/scripts/accounts.js                             |    2 +
 ui/scripts/network.js                              |    2 +-
 ui/scripts/ui-custom/vpc.js                        |    2 +-
 utils/src/com/cloud/utils/script/Script.java       |   15 +-
 131 files changed, 2358 insertions(+), 1827 deletions(-)
----------------------------------------------------------------------



Mime
View raw message