summaryrefslogtreecommitdiff
path: root/BuildParams
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2015-12-18 10:44:42 -0500
committerOz Linden <oz@lindenlab.com>2015-12-18 10:44:42 -0500
commit4b7ff25eba4b285e267ec6f766221ffcde82a808 (patch)
treee8a885c7167046bec9311981a7f690a190248b2a /BuildParams
parentd3b4f34eb7ff80315f1d714aa50bc7d7d33f9855 (diff)
parent7b993d15b70d419dc0a7c8d92286d34a2635537d (diff)
merge changes for 4.0.0-release
Diffstat (limited to 'BuildParams')
-rwxr-xr-xBuildParams9
1 files changed, 6 insertions, 3 deletions
diff --git a/BuildParams b/BuildParams
index aeea3b1246..15fb56ec17 100755
--- a/BuildParams
+++ b/BuildParams
@@ -70,12 +70,15 @@ 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
################################################################
-additional_packages = "EDU"
+## Removed 2015-07-02 (MAINT-5360) until we fix packaging step in Team City
+## 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
-EDU_sourceid = ""
-EDU_viewer_channel_suffix = "edu"
+## 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"
# Notifications - to configure email notices, add a setting like this:
# <username>_<reponame>.email = <email-address>