summaryrefslogtreecommitdiff
path: root/BuildParams
diff options
context:
space:
mode:
authorGlenn Glazer <coyot@lindenlab.com>2016-03-08 13:33:53 -0800
committerGlenn Glazer <coyot@lindenlab.com>2016-03-08 13:33:53 -0800
commit2446fab3746bfef453ec8e3d5a31b30e8f3f91e1 (patch)
tree7bce08e3ee5305fc83b4fb33fcd0fb1be94584fe /BuildParams
parentec683bb9cf6688633d8bc7ecbdf72f7cbc14d349 (diff)
parent8c7a8bdc4a795a158dc8a47928245b0dd74df3f5 (diff)
pull from oz_linden/maint-5360
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>