Author: vinayakumarb
Date: Fri Jul 11 05:16:44 2014
New Revision: 1609631
URL: http://svn.apache.org/r1609631
Log:
Merged revision(s) 1609629 from hadoop/common/trunk:
HDFS-6630. Unable to fetch the block information by Browsing the file system on
Namenode UI through IE9 ( Contributed by Haohui Mai)
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1609631&r1=1609630&r2=1609631&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Fri Jul 11 05:16:44 2014
@@ -39,6 +39,9 @@ Release 2.6.0 - UNRELEASED
HDFS-6646. [ HDFS Rolling Upgrade - Shell ] shutdownDatanode and
getDatanodeInfo
usage is missed ( Brahma Reddy Battula via vinayakumarb)
+ HDFS-6630. Unable to fetch the block information by Browsing the file
system on
+ Namenode UI through IE9 ( Haohui Mai via vinayakumarb)
+
Release 2.5.0 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js?rev=1609631&r1=1609630&r2=1609631&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.js
Fri Jul 11 05:16:44 2014
@@ -103,7 +103,7 @@
}
var url = '/webhdfs/v1' + abs_path + '?op=GET_BLOCK_LOCATIONS';
- $.ajax({"url": url, "crossDomain": true}).done(function(data) {
+ $.get(url).done(function(data) {
var d = get_response(data, "LocatedBlocks");
if (d === null) {
show_err_msg(get_response_err_msg(data));
