merge up to 3.8.0-release (and fix for unit tests with a proxy enabled)'

1 files changed, 6 insertions, 0 deletions

diff --git a/BuildParams b/BuildParams
index 35a737a191..22b13ff6b6 100755
--- a/BuildParams
+++ b/BuildParams
@@ -70,6 +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
 ################################################################
+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"
 
 # Notifications - to configure email notices use the TeamCity parameter
 # setting screen for your project or build configuration to set the