From e665a34810c243d2d9bdec34ae8b8969dc414f5d Mon Sep 17 00:00:00 2001
From: mcilwain <mcilwain@google.com>
Date: Wed, 1 Aug 2018 12:43:28 -0700
Subject: [PATCH] Automated g4 rollback of changelist 204783809.

*** Reason for rollback ***

It's still having the same issues from b/79463634 in sandbox, so we don't want to deploy it to prod.

*** Original change description ***

Switch pubapi/default service to basic scaling in prod/sandbox

Also goes back up to 100 max instances.

Hopefully this'll work better this time.

***

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=206975159
---
 .../env/production/default/WEB-INF/appengine-web.xml       | 7 +++----
 .../env/production/pubapi/WEB-INF/appengine-web.xml        | 7 +++----
 .../registry/env/sandbox/default/WEB-INF/appengine-web.xml | 7 +++----
 .../registry/env/sandbox/pubapi/WEB-INF/appengine-web.xml  | 7 +++----
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/java/google/registry/env/production/default/WEB-INF/appengine-web.xml b/java/google/registry/env/production/default/WEB-INF/appengine-web.xml
index 3cd46adeb..ef28324b7 100644
--- a/java/google/registry/env/production/default/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/production/default/WEB-INF/appengine-web.xml
@@ -8,10 +8,9 @@
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4_1G</instance-class>
-  <basic-scaling>
-    <max-instances>100</max-instances>
-    <idle-timeout>30m</idle-timeout>
-  </basic-scaling>
+  <manual-scaling>
+    <instances>30</instances>
+  </manual-scaling>
 
   <system-properties>
     <property name="java.util.logging.config.file"
diff --git a/java/google/registry/env/production/pubapi/WEB-INF/appengine-web.xml b/java/google/registry/env/production/pubapi/WEB-INF/appengine-web.xml
index fadebf02d..5a6ea5c8e 100644
--- a/java/google/registry/env/production/pubapi/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/production/pubapi/WEB-INF/appengine-web.xml
@@ -8,10 +8,9 @@
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4_1G</instance-class>
-  <basic-scaling>
-    <max-instances>100</max-instances>
-    <idle-timeout>30m</idle-timeout>
-  </basic-scaling>
+  <manual-scaling>
+    <instances>20</instances>
+  </manual-scaling>
 
   <system-properties>
     <property name="java.util.logging.config.file"
diff --git a/java/google/registry/env/sandbox/default/WEB-INF/appengine-web.xml b/java/google/registry/env/sandbox/default/WEB-INF/appengine-web.xml
index d380fce49..c5ed1090a 100644
--- a/java/google/registry/env/sandbox/default/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/sandbox/default/WEB-INF/appengine-web.xml
@@ -8,10 +8,9 @@
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4_1G</instance-class>
-  <basic-scaling>
-    <max-instances>100</max-instances>
-    <idle-timeout>30m</idle-timeout>
-  </basic-scaling>
+  <manual-scaling>
+    <instances>30</instances>
+  </manual-scaling>
 
   <system-properties>
     <property name="java.util.logging.config.file"
diff --git a/java/google/registry/env/sandbox/pubapi/WEB-INF/appengine-web.xml b/java/google/registry/env/sandbox/pubapi/WEB-INF/appengine-web.xml
index 93bd121a3..cde9e57a8 100644
--- a/java/google/registry/env/sandbox/pubapi/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/sandbox/pubapi/WEB-INF/appengine-web.xml
@@ -8,10 +8,9 @@
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4_1G</instance-class>
-  <basic-scaling>
-    <max-instances>100</max-instances>
-    <idle-timeout>30m</idle-timeout>
-  </basic-scaling>
+  <manual-scaling>
+    <instances>20</instances>
+  </manual-scaling>
 
   <system-properties>
     <property name="java.util.logging.config.file"