summaryrefslogtreecommitdiff
path: root/BuildParams
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2016-03-22 16:19:10 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2016-03-22 16:19:10 -0400
commit0879c48d832a69050e6fc6ac67b0d5f95b52e054 (patch)
treec872ae80e13d12c3a282fd2af2c5005b0edb5e95 /BuildParams
parentcbbe82b8dc08260aa4102214a7c99aeab7915371 (diff)
parent2afde26d93cc8773f5e84d187844f909347fc1bf (diff)
merge
Diffstat (limited to 'BuildParams')
-rwxr-xr-xBuildParams9
1 files changed, 3 insertions, 6 deletions
diff --git a/BuildParams b/BuildParams
index 15fb56ec17..aeea3b1246 100755
--- a/BuildParams
+++ b/BuildParams
@@ -70,15 +70,12 @@ additional_packages = ""
# the viewer_channel_suffix is prefixed by a blank and then appended to the viewer_channel
# for the package in a setting that overrides the compiled-in value
################################################################
-## Removed 2015-07-02 (MAINT-5360) until we fix packaging step in Team City
-## additional_packages = "EDU"
+additional_packages = "EDU"
# The EDU package allows us to create a separate release channel whose expirations
# are synchronized as much as possible with the academic year
-## Removed 2015-07-02 (MAINT-5360) until we fix packaging step in Team City
-## EDU_sourceid = ""
-## Removed 2015-07-02 (MAINT-5360) until we fix packaging step in Team City
-## EDU_viewer_channel_suffix = "edu"
+EDU_sourceid = ""
+EDU_viewer_channel_suffix = "edu"
# Notifications - to configure email notices, add a setting like this:
# <username>_<reponame>.email = <email-address>