summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-29 05:30:43 +0000
committerkalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-29 05:30:43 +0000
commit5c97438d1f6170c38aa47001743268aa6ec571a5 (patch)
tree04835903e4edf40a3666d44a49850caa8ca85ad1
parentd2af1f012ef1a9b5c0300f0296f4df0316a62499 (diff)
downloadchromium_src-5c97438d1f6170c38aa47001743268aa6ec571a5.zip
chromium_src-5c97438d1f6170c38aa47001743268aa6ec571a5.tar.gz
chromium_src-5c97438d1f6170c38aa47001743268aa6ec571a5.tar.bz2
Deploy server2.
BUG=131095 Review URL: https://chromiumcodereview.appspot.com/10893018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153860 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/common/extensions/docs/server2/app.yaml4
-rw-r--r--chrome/common/extensions/docs/server2/cron.yaml4
-rw-r--r--chrome/common/extensions/docs/server2/handler.py4
3 files changed, 8 insertions, 4 deletions
diff --git a/chrome/common/extensions/docs/server2/app.yaml b/chrome/common/extensions/docs/server2/app.yaml
index a9a6f21..bce932e0 100644
--- a/chrome/common/extensions/docs/server2/app.yaml
+++ b/chrome/common/extensions/docs/server2/app.yaml
@@ -1,5 +1,5 @@
-application: chrome-apps-doc2
-version: 1-0-0
+application: chrome-apps-doc
+version: 2-0-0
runtime: python27
api_version: 1
threadsafe: false
diff --git a/chrome/common/extensions/docs/server2/cron.yaml b/chrome/common/extensions/docs/server2/cron.yaml
index c36e8c1..c0a4a1f 100644
--- a/chrome/common/extensions/docs/server2/cron.yaml
+++ b/chrome/common/extensions/docs/server2/cron.yaml
@@ -2,15 +2,19 @@ cron:
- description: Load everything for trunk.
url: /cron/trunk
schedule: every 5 minutes
+ target: 2-0-0
- description: Load everything for dev.
url: /cron/dev
schedule: every 5 minutes
+ target: 2-0-0
- description: Load everything for beta.
url: /cron/beta
schedule: every 5 minutes
+ target: 2-0-0
- description: Load everything for stable.
url: /cron/stable
schedule: every 5 minutes
+ target: 2-0-0
diff --git a/chrome/common/extensions/docs/server2/handler.py b/chrome/common/extensions/docs/server2/handler.py
index 0ce5ce3..3396774 100644
--- a/chrome/common/extensions/docs/server2/handler.py
+++ b/chrome/common/extensions/docs/server2/handler.py
@@ -34,9 +34,9 @@ import url_constants
# URL. This is necessary because it is not possible to pass flags to the script
# handler.
# Production settings:
-# DEFAULT_BRANCHES = { 'extensions': 'stable', 'apps': 'trunk' }
+DEFAULT_BRANCHES = { 'extensions': 'stable', 'apps': 'trunk' }
# Dev settings:
-DEFAULT_BRANCHES = { 'extensions': 'local', 'apps': 'local' }
+# DEFAULT_BRANCHES = { 'extensions': 'local', 'apps': 'local' }
BRANCH_UTILITY_MEMCACHE = InMemoryObjectStore('branch_utility')
BRANCH_UTILITY = BranchUtility(url_constants.OMAHA_PROXY_URL,