You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2018/05/02 07:45:56 UTC
[cloudstack] branch 4.9 updated: CLOUDSTACK-10311 Agent Log Rotate
variable replace bug (#2471)
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 <sl...@ippathways.com>
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 @@
</filterreader>
</filterchain>
</copy>
- <copy
- todir="${basedir}/target/transformed">
- <fileset dir="${basedir}/conf">
- <include name="cloudstack-agent.logrotate" />
- </fileset>
- </copy>
</target>
</configuration>
</execution>
--
To stop receiving notification emails like this one, please contact
rohit@apache.org.