Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cloudstack.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: swill@apache.org
To: commits@cloudstack.apache.org
Date: Thu, 19 May 2016 16:11:43 -0000
Message-Id: <a414994574b641d38af010ef4f06a6d6@git.apache.org>
In-Reply-To: <c224e47dc6ed4924be67de541ccbb706@git.apache.org>
References: <c224e47dc6ed4924be67de541ccbb706@git.apache.org>
Subject: [16/20] git commit: updated refs/heads/master to 88cd182
archived-at: Thu, 19 May 2016 16:11:31 -0000

Merge release branch 4.7 to 4.8

* 4.7:
  Fix Sync of template.properties in Swift
  Configure rVPC for router.redundant.vrrp.interval advert_int setting
  Have rVPCs use the router.redundant.vrrp.interval setting
  Resolve conflict as forceencap is already in master
  Split the cidr lists so we won't hit the iptables-resture limits
  Check the existence of 'forceencap' parameter before use
  Do not load previous firewall rules as we replace everyhing anyway
  Wait for dnsmasq to finish restart
  Remove duplicate spaces, and thus duplicate rules.
  Restore iptables at once using iptables-restore instead of calling iptables numerous times
  Add iptables copnversion script.


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

Branch: refs/heads/master
Commit: 8f330b0b928db407341a236b4e6f2647d01ed53e
Parents: a0aa060 06e52e4
Author: Will Stevens <williamstevens@gmail.com>
Authored: Wed May 18 15:54:32 2016 -0400
Committer: Will Stevens <williamstevens@gmail.com>
Committed: Wed May 18 15:54:32 2016 -0400

----------------------------------------------------------------------
 .../datastore/ObjectInDataStoreManagerImpl.java |   1 +
 .../VirtualNetworkApplianceManagerImpl.java     |   3 +
 server/src/com/cloud/test/TestAppender.java     | 178 +++++++++
 services/secondary-storage/server/pom.xml       |   3 -
 .../resource/NfsSecondaryStorageResource.java   | 373 ++++++++++++-------
 .../LocalNfsSecondaryStorageResourceTest.java   |  44 ++-
 .../NfsSecondaryStorageResourceTest.java        | 118 +++---
 .../debian/config/opt/cloud/bin/configure.py    |  39 +-
 .../debian/config/opt/cloud/bin/cs/CsAddress.py |  31 +-
 .../debian/config/opt/cloud/bin/cs/CsDatabag.py |   4 +
 .../debian/config/opt/cloud/bin/cs/CsDhcp.py    |   2 +-
 .../debian/config/opt/cloud/bin/cs/CsFile.py    |   1 +
 .../config/opt/cloud/bin/cs/CsLoadBalancer.py   |  10 +-
 .../config/opt/cloud/bin/cs/CsNetfilter.py      |  72 ++--
 .../config/opt/cloud/bin/cs/CsRedundant.py      |   3 +
 .../config/opt/cloud/bin/cs_iptables_save.py    | 227 +++++++++++
 16 files changed, 804 insertions(+), 305 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8f330b0b/services/secondary-storage/server/pom.xml
----------------------------------------------------------------------
diff --cc services/secondary-storage/server/pom.xml
index 87a0381,63aef27..97e68a8
--- a/services/secondary-storage/server/pom.xml
+++ b/services/secondary-storage/server/pom.xml
@@@ -23,12 -23,9 +23,9 @@@
    <parent>
      <groupId>org.apache.cloudstack</groupId>
      <artifactId>cloudstack-service-secondary-storage</artifactId>
 -    <version>4.7.2-SNAPSHOT</version>
 +    <version>4.8.1-SNAPSHOT</version>
      <relativePath>../pom.xml</relativePath>
    </parent>
-     <properties>
-     <skipTests>true</skipTests>
-   </properties>
      <dependencies>
      <dependency>
        <groupId>log4j</groupId>