From 6875fac8b33bb7ab053d6533313cc848f7b8500e Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@linux.vnet.ibm.com>
Date: Fri, 8 Jan 2016 09:03:01 -0800
Subject: [PATCH] Revert "Schedule Gerrit's git garbage collection"

This reverts commit 925083544a688f630630bcfa88c6ab451c2c2c00.

Garbage collection in *Git* is not the same thing as garbage
collection in *Java*.  We're seeing gerrit spend a lot of time in
*Java* garbage collection.  We do not need to adjust *Git* garbage
collection for that.

Change-Id: Ica3cc603d9e0ed68efbb1c7606f3e7d67fddac3c
---
 modules/openstack_project/manifests/gerrit.pp | 4 ----
 modules/openstack_project/manifests/review.pp | 2 --
 2 files changed, 6 deletions(-)

diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp
index 69d1aa188a..c31ed36d20 100644
--- a/modules/openstack_project/manifests/gerrit.pp
+++ b/modules/openstack_project/manifests/gerrit.pp
@@ -30,8 +30,6 @@ class openstack_project::gerrit (
   $email = '',
   $database_poollimit = '',
   $container_heaplimit = '',
-  $gc_start_time = '',
-  $gc_interval = '',
   $core_packedgitopenfiles = '',
   $core_packedgitlimit = '',
   $core_packedgitwindowsize = '',
@@ -130,8 +128,6 @@ class openstack_project::gerrit (
     openidssourl                        => 'https://login.launchpad.net/+openid',
     database_poollimit                  => $database_poollimit,
     container_heaplimit                 => $container_heaplimit,
-    gc_start_time                       => $gc_start_time,
-    gc_interval                         => $gc_interval,
     core_packedgitopenfiles             => $core_packedgitopenfiles,
     core_packedgitlimit                 => $core_packedgitlimit,
     core_packedgitwindowsize            => $core_packedgitwindowsize,
diff --git a/modules/openstack_project/manifests/review.pp b/modules/openstack_project/manifests/review.pp
index 32153fe21a..4028945e8f 100644
--- a/modules/openstack_project/manifests/review.pp
+++ b/modules/openstack_project/manifests/review.pp
@@ -108,8 +108,6 @@ class openstack_project::review (
       # 1 + 100 + 9 + 2 + 2 + 25 => 139(rounded up)
     database_poollimit                  => '150',
     container_heaplimit                 => '12g',
-    gc_start_time                       => '4:30',
-    gc_interval                         => '1 day',
     core_packedgitopenfiles             => '4096',
     core_packedgitlimit                 => '400m',
     core_packedgitwindowsize            => '16k',