Simplify the memcache sample (GoogleCloudPlatform#838)

Author: Jon Wayne Parrott

appengine/flexible/memcache/app.yaml

@@ -7,12 +7,10 @@ runtime_config:
 
 # [START env_variables]
 env_variables:
-  # If you are using the App Engine Memcache service (currently in alpha),
-  # uncomment this section and comment out the other Memcache variables.
-  # USE_GAE_MEMCACHE: 1
   MEMCACHE_SERVER: your-memcache-server
-  # If you are using a Memcached server with SASL authentiation enabled,
-  # fill in these values with your username and password.
-  MEMCACHE_USERNAME: your-memcache-username
-  MEMCACHE_PASSWORD: your-memcache-password
+  # If you are using a third-party or self-hosted Memcached server with SASL
+  # authentiation enabled, uncomment and fill in these values with your
+  # username and password.
+  # MEMCACHE_USERNAME: your-memcache-username
+  # MEMCACHE_PASSWORD: your-memcache-password
 # [END env_variables]

appengine/flexible/memcache/main.py

@@ -23,14 +23,7 @@
 
 # [START client]
 # Environment variables are defined in app.yaml.
-# Note: USE_GAE_MEMCACHE is in whitelist-only alpha. See README.md
-if os.environ.get('USE_GAE_MEMCACHE'):
-    MEMCACHE_SERVER = ':'.join([
-        os.environ.get('GAE_MEMCACHE_HOST', 'localhost'),
-        os.environ.get('GAE_MEMCACHE_PORT', '11211')])
-else:
-    MEMCACHE_SERVER = os.environ.get('MEMCACHE_SERVER', 'localhost:11211')
-
+MEMCACHE_SERVER = os.environ.get('MEMCACHE_SERVER', 'localhost:11211')
 MEMCACHE_USERNAME = os.environ.get('MEMCACHE_USERNAME')
 MEMCACHE_PASSWORD = os.environ.get('MEMCACHE_PASSWORD')