cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From GitBox <...@apache.org>
Subject [GitHub] rhtyd closed pull request #2471: CLOUDSTACK-10311 Agent Log Rotate variable replace bug
Date Wed, 02 May 2018 07:45:50 GMT
rhtyd closed pull request #2471: CLOUDSTACK-10311 Agent Log Rotate variable replace bug
URL: https://github.com/apache/cloudstack/pull/2471
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/.travis.yml b/.travis.yml
index f975c55eacb..359d6666788 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 2eb6ca9e9aa..02eb9d8b1dc 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>


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

Mime
View raw message