diff --git a/lib/galaxy/datatypes/binary.py b/lib/galaxy/datatypes/binary.py
index 846ed648d5d..9857f8fab3c 100644
--- a/lib/galaxy/datatypes/binary.py
+++ b/lib/galaxy/datatypes/binary.py
@@ -1107,7 +1107,7 @@ class Cool(H5):
return "Cool (HDF5) file (%s)." % (nice_size(dataset.get_size()))
-class MCool(H5):
+class MCool(Cool):
"""
Class describing the multi-resolution cool format (https://github.com/mirnylab/cooler)
"""
diff --git a/lib/galaxy/web/proxy/js/lib/proxy.js b/lib/galaxy/web/proxy/js/lib/proxy.js
index 88f14fc1b20..1857e2632e1 100644
--- a/lib/galaxy/web/proxy/js/lib/proxy.js
+++ b/lib/galaxy/web/proxy/js/lib/proxy.js
@@ -60,7 +60,6 @@ DynamicProxy.prototype.rewriteRequest = function(request) {
DynamicProxy.prototype.targetForRequest = function(request) {
// return proxy target for a given url
var session = this.findSession(request);
- console.log('Session: ', session);
for (var mappedSession in this.sessionMap) {
if(session == mappedSession) {
return this.sessionMap[session].target;
@@ -71,10 +70,8 @@ DynamicProxy.prototype.targetForRequest = function(request) {
};
DynamicProxy.prototype.findSession = function(request) {
- console.log("SessionCookie: ", this.sessionCookie);
var sessionCookie = this.sessionCookie,
rc = request.headers.cookie;
- console.log('RequestCookie: ', rc);
if(!rc) {
return null;
}
@@ -94,10 +91,6 @@ DynamicProxy.prototype.findSession = function(request) {
DynamicProxy.prototype.handleProxyRequest = function(req, res) {
var othis = this;
var target = this.targetForRequest(req);
- console.log(req.method);
- console.log(req.url);
- console.log(target.host);
- console.log(target.port);
if(this.debug) {
console.log("PROXY " + req.method + " " + req.url + " to " + target.host + ':' + target.port);
}
diff --git a/test/functional/tools/validation_hdf5.xml b/test/functional/tools/validation_hdf5.xml
index 12651b5b744..810c1f0092f 100644
--- a/test/functional/tools/validation_hdf5.xml
+++ b/test/functional/tools/validation_hdf5.xml
@@ -13,7 +13,7 @@