[cloudstack] branch 4.11 updated: CLOUDSTACK-10255: Fix agent logrotate (#2429)

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.11
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.11 by this push:
     new 22d6718  CLOUDSTACK-10255: Fix agent logrotate (#2429)
22d6718 is described below

commit 22d6718fe3f83d6c3c47734669fe9cde3e6d1a88
Author: Frank Maximus <th...@gmail.com>
AuthorDate: Wed Jan 24 23:35:27 2018 +0100

    CLOUDSTACK-10255: Fix agent logrotate (#2429)
    
    Renamed cloudstack-agent.logrotate to cloudstack-agent.logrotate.in,
    so Ant will run the filterchain while copying.
    This made the ant run copy block of cloudstack-agent.logrotate unnecessary,
    so this is removed.
---
 .../{cloudstack-agent.logrotate => cloudstack-agent.logrotate.in}   | 0
 agent/pom.xml                                                       | 6 ------
 2 files changed, 6 deletions(-)

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 3ee1c5d..0505752 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.