# HG changeset patch
# User melissacline
# Date 1436823334 25200
# Node ID fc6f937103842702cda924d07a7fe93028cb6e7a
# Parent  782e91e9ef48eb2c83a898d32a56bb5044dce3b3# Parent  e1a4d4552ec08323930ae6dcaa58d2455dc08910
Fixing a merge issue

diff -r e1a4d4552ec0 -r fc6f93710384 ucsc_xena_datapages.xml
--- a/ucsc_xena_datapages.xml	Mon Jul 13 14:17:54 2015 -0700
+++ b/ucsc_xena_datapages.xml	Mon Jul 13 14:35:34 2015 -0700
@@ -3,6 +3,7 @@
     If the value of 'URL_method' is 'get', the request will consist of the value of 'URL' coming back in
     the initial response.  If value of 'URL_method' is 'post', any additional params coming back in the
     initial response ( in addition to 'URL' ) will be encoded and appended to URL and a post will be performed.
+   July 13, 2015
 -->
 <tool name="Explore Data in Xena" id="ucsc_xenadatapages" tool_type="data_source">
     <description>Browse the UCSC Xena Data Pages.</description>
diff -r e1a4d4552ec0 -r fc6f93710384 ucsc_xena_hub.xml
--- a/ucsc_xena_hub.xml	Mon Jul 13 14:17:54 2015 -0700
+++ b/ucsc_xena_hub.xml	Mon Jul 13 14:35:34 2015 -0700
@@ -3,6 +3,7 @@
     If the value of 'URL_method' is 'get', the request will consist of the value of 'URL' coming back in
     the initial response.  If value of 'URL_method' is 'post', any additional params coming back in the
     initial response ( in addition to 'URL' ) will be encoded and appended to URL and a post will be performed.
+   July 13, 2015
 -->
 <tool name="Xena Data Hub" id="ucsc_xenadatahub" tool_type="data_source">
     <description>Select your Xena Data Hub</description>
diff -r e1a4d4552ec0 -r fc6f93710384 ucsc_xenabrowser.xml
--- a/ucsc_xenabrowser.xml	Mon Jul 13 14:17:54 2015 -0700
+++ b/ucsc_xenabrowser.xml	Mon Jul 13 14:35:34 2015 -0700
@@ -3,11 +3,12 @@
     If the value of 'URL_method' is 'get', the request will consist of the value of 'URL' coming back in
     the initial response.  If value of 'URL_method' is 'post', any additional params coming back in the
     initial response ( in addition to 'URL' ) will be encoded and appended to URL and a post will be performed.
+   July 13, 2015
 -->
 <tool name="UCSC Xena Browser" id="ucsc_xenabrowser" tool_type="data_source">
     <description>Run the UCSC Xena Browser as a Galaxy tool.</description>
     <command interpreter="python">ucsc_xena_download.py $genomic $clinical $__app__.config.output_size_limit</command>   
-    <inputs action="https://genome-cancer.ucsc.edu/proj/site/xena/heatmap/" check_values="false" method="get">
+    <inputs action="https://genome-cancer.soe.ucsc.edu/proj/site/xena/heatmap/" check_values="false" method="get">
          <display>go to UCSC Xena Browser $GALAXY_URL</display>
         <param name="GALAXY_URL" type="baseurl" value="/tool_runner" />
         <param name="tool_id" type="hidden" value="ucsc_xenabrowser" />
diff -r e1a4d4552ec0 -r fc6f93710384 xena.jar