Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C509210678 for ; Mon, 16 Feb 2015 16:39:57 +0000 (UTC) Received: (qmail 18683 invoked by uid 500); 16 Feb 2015 16:39:53 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 18635 invoked by uid 500); 16 Feb 2015 16:39:53 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 17074 invoked by uid 99); 16 Feb 2015 16:39:53 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Feb 2015 16:39:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DFAF0E0D7A; Mon, 16 Feb 2015 16:39:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dahn@apache.org To: commits@cloudstack.apache.org Date: Mon, 16 Feb 2015 16:40:30 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [39/50] git commit: updated refs/heads/feature/systemvm-persistent-config to 921f6e2 Merge branch 'feature/systemvm-persistent-config-4' of github.com:schubergphilis/cloudstack into feature/systemvm-persistent-config-4 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/68ed379f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/68ed379f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/68ed379f Branch: refs/heads/feature/systemvm-persistent-config Commit: 68ed379f4a97e2697a3a7510ddba8337de89de38 Parents: 8ac18a7 454f3e4 Author: Ian Southam Authored: Fri Feb 6 13:54:28 2015 +0100 Committer: Ian Southam Committed: Fri Feb 6 13:54:28 2015 +0100 ---------------------------------------------------------------------- .../classes/resources/messages.properties | 2 +- .../src/com/cloud/network/dao/NetworkDao.java | 2 + .../com/cloud/network/dao/NetworkDaoImpl.java | 234 ++++++++++--------- .../com/cloud/vm/dao/DomainRouterDaoImpl.java | 162 ++++++------- .../VirtualNetworkApplianceManagerImpl.java | 36 ++- .../com/cloud/vpc/dao/MockNetworkDaoImpl.java | 78 ++++--- .../opt/cloud/templates/checkrouter.sh.templ | 8 +- 7 files changed, 280 insertions(+), 242 deletions(-) ----------------------------------------------------------------------