Update Main

galaxyproject · Mar 12, 2018 · 0959681 · 0959681
1 parent b1ea115
commit 0959681
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/env/main/files/galaxy/galaxy_version.yml b/env/main/files/galaxy/galaxy_version.yml
@@ -1,3 +1,3 @@
 ---
 galaxy_version: 18.01.rc1
-galaxy_commit: fa283b525f4412fbc3d05ad10feb7176b52a27f3
+galaxy_commit: e12e773eddca7f2ebb342534c40672a3800a129c
diff --git a/env/main/group_vars/all.yml b/env/main/group_vars/all.yml
@@ -3,8 +3,8 @@
 instance_root: /srv/galaxy/main
 # NOTE: When you change this from a release to a pre-release branch, enable client building on update in
 # group_vars/cvmfsstratum0servers.yml. When that branch becomes stable, disable client building.
-#galaxy_branch: usegalaxy
-galaxy_ref: fa283b525f4412fbc3d05ad10feb7176b52a27f3
+galaxy_branch: usegalaxy
+#galaxy_ref: fa283b525f4412fbc3d05ad10feb7176b52a27f3
 galaxy_user: g2main
 galaxy_privileged_user: gxsrc
 galaxy_instance_hostname: usegalaxy.org