Merge remote-tracking branch 'upstream/phase4-11-07-2015' into python-registry-v2

config.py

@@ -45,8 +45,8 @@ class DefaultConfig(object):
   PREFERRED_URL_SCHEME = 'http'
   SERVER_HOSTNAME = 'localhost:5000'
 
-  REGISTRY_TITLE = 'CoreOS Enterprise Registry'
-  REGISTRY_TITLE_SHORT = 'Enterprise Registry'
+  REGISTRY_TITLE = 'Quay Enterprise'
+  REGISTRY_TITLE_SHORT = 'Quay Enterprise'
 
   CONTACT_INFO = [
     'mailto:support@quay.io',
@@ -253,3 +253,12 @@ class DefaultConfig(object):
 
   # Experiment: Async garbage collection
   EXP_ASYNC_GARBAGE_COLLECTION = []
+
+  # Security scanner
+  FEATURE_SECURITY_SCANNER = False
+  SECURITY_SCANNER = {
+    'ENDPOINT': 'http://192.168.99.100:6060',
+    'ENGINE_VERSION_TARGET': 1,
+    'API_VERSION': 'v1',
+    'API_TIMEOUT_SECONDS': 10,
+  }