Merge lp:~corey.bryant/neutron/2014.1.5 into lp:~ubuntu-server-dev/neutron/icehouse

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2015-06-23 00:48:22 +0000
+++ debian/changelog	2015-06-24 14:56:00 +0000
@@ -10,6 +10,13 @@
 
  -- Corey Bryant <[e-mail]>  Mon, 22 Jun 2015 10:14:52 -0400
 
+neutron (1:2014.1.4-0ubuntu3) trusty; urgency=medium
+
+  *  d/*.logrotate,neutron-common.logrotate: Backport from vivid,
+     Move to single logrotate configuration. (LP: #1463844).
+
+ -- Jorge Niedbalski <[e-mail]>  Wed, 10 Jun 2015 11:09:20 -0300
+
 neutron (1:2014.1.4-0ubuntu2) trusty; urgency=medium
 
   * d/control: Set minimum python-six dependency to 1.5.2 (LP: #1403114).
 
=== added file 'debian/neutron-common.logrotate'
--- debian/neutron-common.logrotate	1970-01-01 00:00:00 +0000
+++ debian/neutron-common.logrotate	2015-06-24 14:56:00 +0000
@@ -0,0 +1,8 @@
+/var/log/neutron/*.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+    copytruncate
+}
 
=== removed file 'debian/neutron-dhcp-agent.logrotate'
--- debian/neutron-dhcp-agent.logrotate	2014-03-07 09:21:15 +0000
+++ debian/neutron-dhcp-agent.logrotate	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-/var/log/neutron/dhcp-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-}
 
=== removed file 'debian/neutron-l3-agent.logrotate'
--- debian/neutron-l3-agent.logrotate	2014-03-07 09:21:15 +0000
+++ debian/neutron-l3-agent.logrotate	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-/var/log/neutron/l3-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-}
 
=== removed file 'debian/neutron-lbaas-agent.logrotate'
--- debian/neutron-lbaas-agent.logrotate	2014-03-07 09:21:15 +0000
+++ debian/neutron-lbaas-agent.logrotate	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-/var/log/neutron/lbaas-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-}
 
=== removed file 'debian/neutron-metadata-agent.logrotate'
--- debian/neutron-metadata-agent.logrotate	2014-03-07 09:21:15 +0000
+++ debian/neutron-metadata-agent.logrotate	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-/var/log/neutron/metadata-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-}
 
=== removed file 'debian/neutron-plugin-bigswitch-agent.logrotate'
--- debian/neutron-plugin-bigswitch-agent.logrotate	2014-03-07 09:21:15 +0000
+++ debian/neutron-plugin-bigswitch-agent.logrotate	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-/var/log/neutron/bigswitch-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-}
 
=== removed file 'debian/neutron-plugin-ibm-agent.logrotate'
--- debian/neutron-plugin-ibm-agent.logrotate	2014-03-07 09:21:15 +0000
+++ debian/neutron-plugin-ibm-agent.logrotate	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-/var/log/neutron/ibm-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-}
 
=== removed file 'debian/neutron-plugin-linuxbridge-agent.logrotate'
--- debian/neutron-plugin-linuxbridge-agent.logrotate	2014-03-07 09:21:15 +0000
+++ debian/neutron-plugin-linuxbridge-agent.logrotate	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-/var/log/neutron/linuxbridge-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-}
 
=== removed file 'debian/neutron-plugin-mlnx-agent.logrotate'
--- debian/neutron-plugin-mlnx-agent.logrotate	2014-03-07 09:26:23 +0000
+++ debian/neutron-plugin-mlnx-agent.logrotate	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-/var/log/neutron/mlnx-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-}
 
=== removed file 'debian/neutron-plugin-nec-agent.logrotate'
--- debian/neutron-plugin-nec-agent.logrotate	2014-03-07 09:21:15 +0000
+++ debian/neutron-plugin-nec-agent.logrotate	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-/var/log/neutron/nec-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-}
 
=== removed file 'debian/neutron-plugin-oneconvergence-agent.logrotate'
--- debian/neutron-plugin-oneconvergence-agent.logrotate	2014-03-20 15:42:58 +0000
+++ debian/neutron-plugin-oneconvergence-agent.logrotate	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-/var/log/neutron/nvsd-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-}
 
=== removed file 'debian/neutron-plugin-openflow-agent.logrotate'
--- debian/neutron-plugin-openflow-agent.logrotate	2014-03-07 09:21:15 +0000
+++ debian/neutron-plugin-openflow-agent.logrotate	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-/var/log/neutron/openflow-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-}
 
=== removed file 'debian/neutron-plugin-openvswitch-agent.logrotate'
--- debian/neutron-plugin-openvswitch-agent.logrotate	2014-03-07 09:21:15 +0000
+++ debian/neutron-plugin-openvswitch-agent.logrotate	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-/var/log/neutron/openvswitch-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-}
 
=== removed file 'debian/neutron-plugin-ryu-agent.logrotate'
--- debian/neutron-plugin-ryu-agent.logrotate	2014-03-07 09:21:15 +0000
+++ debian/neutron-plugin-ryu-agent.logrotate	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-/var/log/neutron/ryu-agent.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-}
 
=== removed file 'debian/neutron-server.logrotate'
--- debian/neutron-server.logrotate	2014-03-07 09:21:15 +0000
+++ debian/neutron-server.logrotate	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-/var/log/neutron/server.log {
-    daily
-    missingok
-    compress
-    delaycompress
-    notifempty
-}