diff --git a/build-devmaster.make b/build-devmaster.make index a37a7224e7..a38bd84a80 100644 --- a/build-devmaster.make +++ b/build-devmaster.make @@ -12,20 +12,10 @@ projects[drupal][version] = 7.61 ; RELEASE ; Leave in place for replacement by release process. -projects[devmaster][version] = 1.x-dev +projects[devmaster][version] = 1.50-rc6 projects[devmaster][type] = "profile" projects[devmaster][download][type] = "git" -###DEVELOPMENTSTART### -; DEVELOPMENT OVERRIDE -; Removed during release process. -; This is so that different version of "devshop" (the branch) can install a different version of devmaster. -; This ensures that people that install the latest 1.x devshop get the absolute latest from github. -projects[devmaster][type] = profile -projects[devmaster][download][type] = git -projects[devmaster][download][branch] = 7.x-1.x -projects[devmaster][download][url] = "https://github.com/opendevshop/devmaster.git" -###DEVELOPMENTEND### ; CAS ; The CAS and HybridAuth libraries are not whitelisted by drupal.org, so we include them here. diff --git a/install.sh b/install.sh index eca6b4940f..40a1077711 100755 --- a/install.sh +++ b/install.sh @@ -49,7 +49,7 @@ set -e # Version used for cloning devshop playbooks # Must be a branch or tag. -DEVSHOP_VERSION=1.x +DEVSHOP_VERSION=1.5.0-rc6 DEVSHOP_INSTALL_PATH=/usr/share/devshop SERVER_WEBSERVER=apache MAKEFILE_PATH=''