Merge pull request #29128 from bprashanth/logrotate

Automatic merge from submit-queue Change maxsize to size in logrotate. How do I trigger a test? I usually test logrotate with `logrotate -s` and that works as expected.

Merge pull request #29128 from bprashanth/logrotate
bbc09d5e · k8s-merge-robot · GitHub · 61087258 · 1173dd13 · bbc09d5e
Commit bbc09d5e authored Jul 18, 2016 by k8s-merge-robot Committed by GitHub Jul 18, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

configure-helper.sh cluster/gce/gci/configure-helper.sh +1 -1

conf cluster/saltbase/salt/logrotate/conf +1 -1

No files found.
--- a/cluster/gce/gci/configure-helper.sh
+++ b/cluster/gce/gci/configure-helper.sh
@@ -92,7 +92,7 @@ EOF
    missingok
    notifempty
    compress
-    maxsize 100M
+    size 100M
    daily
    create 0644 root root
 }

--- a/cluster/saltbase/salt/logrotate/conf
+++ b/cluster/saltbase/salt/logrotate/conf
@@ -4,7 +4,7 @@
    missingok
    notifempty
    compress
-    maxsize 100M
+    size 100M
    daily
    create 0644 root root
 }