Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 521FDDB7B for ; Tue, 4 Sep 2012 22:13:01 +0000 (UTC) Received: (qmail 57815 invoked by uid 500); 4 Sep 2012 22:12:53 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 57753 invoked by uid 500); 4 Sep 2012 22:12:53 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 56830 invoked by uid 99); 4 Sep 2012 22:12:52 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Sep 2012 22:12:52 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 264A21B05D; Tue, 4 Sep 2012 22:12:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ahuang@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [33/50] [abbrv] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack Message-Id: <20120904221252.264A21B05D@tyr.zones.apache.org> Date: Tue, 4 Sep 2012 22:12:52 +0000 (UTC) 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/16cacf4c Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/16cacf4c Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/16cacf4c Branch: refs/heads/4.0 Commit: 16cacf4c45f40f9a34404443910affb660fb91b6 Parents: d18ac73 22327d2 Author: Hugo Trippaers Authored: Fri Aug 31 18:57:08 2012 +0200 Committer: Hugo Trippaers Committed: Fri Aug 31 18:57:08 2012 +0200 ---------------------------------------------------------------------- build/deploy/production/db/templates-dev.sql | 32 +- deps/cloud-axis.jar | Bin 1599570 -> 0 bytes deps/cloud-backport-util-concurrent-3.0.jar | Bin 327810 -> 0 bytes deps/cloud-bcprov-jdk16-1.45.jar | Bin 1719483 -> 0 bytes deps/cloud-cglib.jar | Bin 332756 -> 0 bytes deps/cloud-commons-codec-1.5.jar | Bin 73098 -> 0 bytes deps/cloud-commons-collections-3.2.1.jar | Bin 575389 -> 0 bytes deps/cloud-commons-configuration-1.8.jar | Bin 354491 -> 0 bytes deps/cloud-commons-dbcp-1.4.jar | Bin 160519 -> 0 bytes deps/cloud-commons-discovery.jar | Bin 71442 -> 0 bytes deps/cloud-commons-httpclient-3.1.jar | Bin 305001 -> 0 bytes deps/cloud-commons-lang-2.6.jar | Bin 284220 -> 0 bytes deps/cloud-commons-logging-1.1.1.jar | Bin 60841 -> 0 bytes deps/cloud-commons-pool-1.5.6.jar | Bin 100472 -> 0 bytes deps/cloud-ehcache.jar | Bin 263854 -> 0 bytes deps/cloud-ejb-api-3.0.jar | Bin 32941 -> 0 bytes deps/cloud-email.jar | Bin 434812 -> 0 bytes deps/cloud-google-gson-1.7.1.jar | Bin 173590 -> 0 bytes deps/cloud-httpcore-4.0.jar | Bin 172914 -> 0 bytes deps/cloud-iControl.jar | Bin 2284200 -> 0 bytes deps/cloud-jasypt-1.8.jar | Bin 178961 -> 0 bytes deps/cloud-javax.persistence-2.0.0.jar | Bin 134684 -> 0 bytes deps/cloud-jnetpcap.jar | Bin 540571 -> 0 bytes deps/cloud-jsch-0.1.42.jar | Bin 185746 -> 0 bytes deps/cloud-jstl-1.2.jar | Bin 414240 -> 0 bytes deps/cloud-junit.jar | Bin 237047 -> 0 bytes deps/cloud-log4j-extras.jar | Bin 346729 -> 0 bytes deps/cloud-log4j.jar | Bin 481534 -> 0 bytes deps/cloud-manageontap.jar | Bin 55444 -> 0 bytes deps/cloud-netscaler-sdx.jar | Bin 138839 -> 0 bytes deps/cloud-netscaler.jar | Bin 1881606 -> 0 bytes deps/cloud-servlet-api.jar | Bin 83787 -> 0 bytes deps/cloud-trilead-ssh2-build213.jar | Bin 252914 -> 0 bytes deps/cloud-ws-commons-util-1.0.2.jar | Bin 34407 -> 0 bytes deps/cloud-wsdl4j-1.6.2.jar | Bin 148429 -> 0 bytes deps/cloud-wsdl4j.jar | Bin 126771 -> 0 bytes deps/cloud-xenserver-5.6.100-1.jar | Bin 426631 -> 0 bytes deps/cloud-xmlrpc-client-3.1.3.jar | Bin 58573 -> 0 bytes deps/cloud-xmlrpc-common-3.1.3.jar | Bin 109131 -> 0 bytes deps/cloud-xstream-1.3.1.jar | Bin 431406 -> 0 bytes deps/jetty-6.1.26.jar | Bin 539912 -> 0 bytes deps/jetty-util-6.1.26.jar | Bin 177131 -> 0 bytes deps/libvirt-0.4.8.jar | Bin 70122 -> 0 bytes deps/vmware-apputils.jar | Bin 40057 -> 0 bytes deps/vmware-lib-jaxrpc.jar | Bin 31191 -> 0 bytes deps/vmware-vim.jar | Bin 2645679 -> 0 bytes deps/vmware-vim25.jar | Bin 5666804 -> 0 bytes .../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 +- .../src/com/cloud/upgrade/dao/Upgrade30xBase.java | 26 +- tools/build/addcopyright.py | 588 ++++++++------- .../tooljars/cloud-selenium-java-client-driver.jar | Bin 16175099 -> 0 bytes 86 files changed, 908 insertions(+), 767 deletions(-) ----------------------------------------------------------------------