Merge branch '4.9' into 4.10
diff --git a/.travis.yml b/.travis.yml
index c4790ed..414f6f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -149,9 +149,9 @@
# - 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 5837450..22e3fc6 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>
