Update Main and remove Stampede banner.

galaxyproject · Dec 12, 2014 · 91be42d · 91be42d
1 parent 483a94e
commit 91be42d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/files/galaxy/usegalaxy.org/var/integrated_tool_panel.xml b/files/galaxy/usegalaxy.org/var/integrated_tool_panel.xml
@@ -252,6 +252,9 @@
     </section>
     <label id="ngs" text="NGS Toolbox Beta" version="" />
     <section id="hgv" name="Phenotype Association" version="">
+        <tool id="hgv_codingSnps" />
+        <tool id="hgv_add_scores" />
+        <tool id="hgv_sift" />
         <tool id="toolshed.g2.bx.psu.edu/repos/devteam/vcf2pgsnp/vcf2pgSnp/1.0.0" />
         <tool id="toolshed.g2.bx.psu.edu/repos/devteam/snpfreq/hgv_snpFreq/1.0.1" />
         <tool id="toolshed.g2.bx.psu.edu/repos/devteam/dgidb_annotator/dgidb_annotator/0.1" />
@@ -261,9 +264,6 @@
         <tool id="toolshed.g2.bx.psu.edu/repos/devteam/divide_pg_snp/dividePgSnp/1.0.0" />
         <tool id="toolshed.g2.bx.psu.edu/repos/devteam/ctd_batch/ctdBatch_1/1.0.0" />
         <tool id="toolshed.g2.bx.psu.edu/repos/devteam/freebayes/freebayes/0.0.2" />
-        <tool id="hgv_codingSnps" />
-        <tool id="hgv_add_scores" />
-        <tool id="hgv_sift" />
         <tool id="hgv_linkToGProfile" />
         <tool id="hgv_david" />
         <tool id="hgv_ldtools" />
@@ -332,9 +332,9 @@
         <tool id="toolshed.g2.bx.psu.edu/repos/devteam/samtools_slice_bam/samtools_slice_bam/0.0.1" />
         <tool id="toolshed.g2.bx.psu.edu/repos/devteam/samtools_rmdup/samtools_rmdup/1.0.0" />
         <tool id="toolshed.g2.bx.psu.edu/repos/devteam/samtools_mpileup/samtools_mpileup/0.0.1" />
-        <tool id="toolshed.g2.bx.psu.edu/repos/devteam/samtools_flagstat/samtools_flagstat/1.0.0" />
-        <tool id="toolshed.g2.bx.psu.edu/repos/devteam/sam_to_bam/sam_to_bam/1.1.2" />
         <tool id="toolshed.g2.bx.psu.edu/repos/devteam/sam_pileup/sam_pileup/1.1.1" />
+        <tool id="toolshed.g2.bx.psu.edu/repos/devteam/sam_to_bam/sam_to_bam/1.1.2" />
+        <tool id="toolshed.g2.bx.psu.edu/repos/devteam/samtools_flagstat/samtools_flagstat/1.0.0" />
         <tool id="toolshed.g2.bx.psu.edu/repos/devteam/sam_merge/sam_merge2/1.1.2" />
         <tool id="toolshed.g2.bx.psu.edu/repos/devteam/sam_bitwise_flag_filter/sam_bw_filter/1.0.0" />
         <tool id="toolshed.g2.bx.psu.edu/repos/devteam/sam2interval/sam2interval/1.0.1" />

diff --git a/production/group_vars/all.yml b/production/group_vars/all.yml
@@ -2,5 +2,5 @@
 
 deploy_env: production
 
-galaxy_changeset_id: 4b6b1d2d740732a982c922b264d2027ed2c90370
+galaxy_changeset_id: 7a027f285f3b441f8ff1fe48dfc5841d8bc41bfa
 galaxy_repo: https://bitbucket.org/galaxy/galaxy-central/
diff --git a/production/group_vars/galaxyservers.yml b/production/group_vars/galaxyservers.yml
@@ -98,9 +98,9 @@ galaxy_config:
   "app:main":
 
     # message box
-    message_box_visible: "True"
-    message_box_content: 'New high performance job execution options are available! See <a target="_blank" href="https://wiki.galaxyproject.org/Main#Beta:_Job_execution_on_Stampede">the wiki</a> for more information.'
-    message_box_class: info
+    #message_box_visible: "True"
+    #message_box_content: 'New high performance job execution options are available! See <a target="_blank" href="https://wiki.galaxyproject.org/Main#Beta:_Job_execution_on_Stampede">the wiki</a> for more information.'
+    #message_box_class: info
 
     # this can be removed after 9/22 and the datatypes_conf.xml update
     gbrowse_display_sites: wormbase,tair,modencode_worm,modencode_fly