From commits-return-75791-archive-asf-public=cust-asf.ponee.io@cloudstack.apache.org Wed May 2 09:45:59 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 9833318065D for ; Wed, 2 May 2018 09:45:58 +0200 (CEST) Received: (qmail 63281 invoked by uid 500); 2 May 2018 07:45:57 -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 63272 invoked by uid 99); 2 May 2018 07:45:57 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 May 2018 07:45:57 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id A15A480B73; Wed, 2 May 2018 07:45:56 +0000 (UTC) Date: Wed, 02 May 2018 07:45:56 +0000 To: "commits@cloudstack.apache.org" Subject: [cloudstack] branch 4.9 updated: CLOUDSTACK-10311 Agent Log Rotate variable replace bug (#2471) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <152524715616.23024.17803857563332486864@gitbox.apache.org> From: rohit@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: cloudstack X-Git-Refname: refs/heads/4.9 X-Git-Reftype: branch X-Git-Oldrev: 78abb353ac84f5052af749b20f5e0584064e1051 X-Git-Newrev: df2b26e350121834435d1f4b888a8ecd00c0b5db X-Git-Rev: df2b26e350121834435d1f4b888a8ecd00c0b5db X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.9 in repository https://gitbox.apache.org/repos/asf/cloudstack.git The following commit(s) were added to refs/heads/4.9 by this push: new df2b26e CLOUDSTACK-10311 Agent Log Rotate variable replace bug (#2471) df2b26e is described below commit df2b26e350121834435d1f4b888a8ecd00c0b5db Author: Slair1 AuthorDate: Wed May 2 02:45:48 2018 -0500 CLOUDSTACK-10311 Agent Log Rotate variable replace bug (#2471) * CLOUDSTACK-10311 Agent Log Rotate variable replace bug * update travis timeouts --- .travis.yml | 4 ++-- .../{cloudstack-agent.logrotate => cloudstack-agent.logrotate.in} | 0 agent/pom.xml | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index f975c55..359d666 100644 --- a/.travis.yml +++ b/.travis.yml @@ -149,9 +149,9 @@ env: # - TESTS="component/test_accounts" # - TESTS="component/test_organization_states" -before_install: travis_wait 30 ./tools/travis/before_install.sh +before_install: travis_wait 60 ./tools/travis/before_install.sh install: ./tools/travis/install.sh -before_script: travis_wait 30 ./tools/travis/before_script.sh +before_script: travis_wait 60 ./tools/travis/before_script.sh script: - travis_wait 40 ./tools/travis/script.sh ${TESTS} after_success: ./tools/travis/after_success.sh diff --git a/agent/conf/cloudstack-agent.logrotate b/agent/conf/cloudstack-agent.logrotate.in similarity index 100% rename from agent/conf/cloudstack-agent.logrotate rename to agent/conf/cloudstack-agent.logrotate.in diff --git a/agent/pom.xml b/agent/pom.xml index 2eb6ca9..02eb9d8 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -93,12 +93,6 @@ - - - - - -- To stop receiving notification emails like this one, please contact rohit@apache.org.