Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,578 Commits 326 Branches 371 Tags 1.5 GiB
Commit Graph

2746 Commits

Author SHA1 Message Date
Tsuyoshi Ozawa aa792b7d0c HADOOP-12575. Add build instruction for docker toolbox instead of boot2docker. Contributed by Kai Sasaki. 
(cherry picked from commit 25e82b4eb9)
 2015-11-19 17:44:21 +09:00
Tsuyoshi Ozawa c5fb02ba25 HADOOP-12582. Using BytesWritable's getLength() and getBytes() instead of get() and getSize(). Contributed by Akira AJISAKA. 
(cherry picked from commit bd166f0eed)
 2015-11-19 17:27:35 +09:00
Tsuyoshi Ozawa eb4c9765d9 HADOOP-12564. Upgrade JUnit3 TestCase to JUnit 4 in org.apache.hadoop.io package. Contributed by Dustin Cote. 
(cherry picked from commit 989b9e3e11)
 2015-11-19 01:38:40 +09:00
Eric Yang 123e0b16f2 HADOOP-8419. Fixed GzipCode NPE reset for IBM JDK. (Yu Li via eyang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1431740 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 8064849203)
 2015-11-19 01:36:24 +09:00
Akira Ajisaka d5782a4199 HADOOP-12568. Update core-default.xml to describe posixGroups support. Contributed by Wei-Chiu Chuang. 
(cherry picked from commit 4a3b8f1ed2)
 2015-11-18 17:23:34 +09:00
cnauroth 397836a7b3 HADOOP-12567. NPE in SaslRpcServer. Contributed by Sergey Shelukhin. 
(cherry picked from commit 7fab5c8cec)
 2015-11-17 16:00:33 -08:00
Akira Ajisaka 8de7911eb3 MAPREDUCE-6499. Add elapsed time for retired job in JobHistoryServer WebUI. Contributed by Lin Yiqun. 
(cherry picked from commit a7f776ffdf)
 2015-11-17 15:18:32 +09:00
Tsuyoshi Ozawa d66fe1155b Move HADOOP-11361, HADOOP-12348 and HADOOP-12482 from 2.8.0 to 2.7.3 in CHANGES.txt for backporting. 
(cherry picked from commit c753617a48)
 2015-11-14 14:44:17 +09:00
Akira Ajisaka 1b9385c56c Move HADOOP-12374 from 2.8.0 to 2.7.3 in CHANGES.txt. 
(cherry picked from commit 47c79a2a4d)
 2015-11-14 13:15:35 +09:00
Akira Ajisaka c5c663c05d HADOOP-12545. Hadoop javadoc has broken links for AccessControlList, ImpersonationProvider, DefaultImpersonationProvider, and DistCp. Contributed by Arshad Mohammad. 
(cherry picked from commit f94d892704)
 2015-11-13 21:53:23 +09:00
Haohui Mai 5d9212c139 HADOOP-12562. Make hadoop dockerfile usable by Yetus. Contributed by Allen Wittenauer. 2015-11-12 10:20:33 -08:00
Tsuyoshi Ozawa f6cecbfce5 Updated CHANGES.txt to move HADOOP-12526 to 2.6.3. 2015-11-11 23:21:36 +09:00
Vinod Kumar Vavilapalli b742ea7fe6 HADOOP-12451. Setting HADOOP_HOME explicitly should be allowed. Fixing bugs in 
the first patch committed. (Karthik Kambatla via vinodkv)
 2015-11-10 12:16:52 -08:00
Colin Patrick Mccabe 7a47989bc9 HADOOP-12560: Fix sprintf warnings in {{DomainSocket.c}} introduced by HADOOP-12344 (Mingliang Liu via Colin P. McCabe) 
(cherry picked from commit 493e8ae552)
 2015-11-10 10:58:36 -08:00
Lei Xu a7243de1a1 HADOOP-12482. Race condition in JMX cache update. (Tony Wu via lei) 
(cherry picked from commit 0eb9c60c5b)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
 2015-11-09 23:02:38 -08:00
Haohui Mai c91bd3aabb HDFS-2261. AOP unit tests are not getting compiled or run. Contributed by Haohui Mai. 2015-11-09 15:26:01 -08:00
Sangjin Lee 7802248c23 HADOOP-12526. there are duplicate dependency definitions in pom's (sjlee) 2015-11-08 17:46:37 -08:00
Lei Xu 47941858af Revert "HADOOP-11684. S3a to use thread pool that blocks clients. (Thomas Demoor and Aaron Fabbri via lei)" 
This reverts commit 01ae30796d.
 2015-11-06 09:52:21 -08:00
Jason Lowe 836bfdd646 Update CHANGES.txt for commit of HADOOP 12413 to 2.7.3 and 2.6.3 
(cherry picked from commit 74a9a51886)
 2015-11-06 17:18:23 +00:00
Lei Xu 01ae30796d HADOOP-11684. S3a to use thread pool that blocks clients. (Thomas Demoor and Aaron Fabbri via lei) 
(cherry picked from commit bff7c90a56)
 2015-11-05 18:36:55 -08:00
Colin Patrick Mccabe f7e6a5dfb1 Revert "HADOOP-11887. Introduce Intel ISA-L erasure coding library for native erasure encoding support (Kai Zheng via Colin P. McCabe)" 
This reverts commit bb3b2977cd.
 2015-11-05 11:11:27 -08:00
Colin Patrick Mccabe bb3b2977cd HADOOP-11887. Introduce Intel ISA-L erasure coding library for native erasure encoding support (Kai Zheng via Colin P. McCabe) 
(cherry picked from commit 482e35c55a)
 2015-11-05 10:46:12 -08:00
cnauroth 81f7e8af22 HADOOP-12540. TestAzureFileSystemInstrumentation#testClientErrorMetrics fails intermittently due to assumption that a lease error will be thrown. Contributed by Gaurav Kanade. 
(cherry picked from commit 0fb1867fd6)
 2015-11-04 10:29:01 -08:00
Haohui Mai 6d92778191 Revert "HDFS-8855. Webhdfs client leaks active NameNode connections. Contributed by Xiaobing Zhou." 
This reverts commit e7203b6954.
 2015-11-04 10:22:21 -08:00
Jason Lowe b9389ac5b5 HADOOP-12296. when setnetgrent returns 0 in linux, exception should be thrown. Contributed by Chang Li 
(cherry picked from commit b9d25c3ee2)
 2015-11-04 16:35:12 +00:00
Jason Lowe 8334d86472 Add 2.7.3 release to CHANGES.txt 
(cherry picked from commit 0383a3973b)
 2015-11-04 16:27:28 +00:00
cnauroth afff29113a HADOOP-12542. TestDNS fails on Windows after HADOOP-12437. Contributed by Chris Nauroth. 
(cherry picked from commit 957f0311a1)
 2015-11-02 22:25:12 -08:00
cnauroth c1d7b26e94 HADOOP-12508. delete fails with exception when lease is held on blob. Contributed by Gaurav Kanade. 
(cherry picked from commit 9e7dcab185)
 2015-11-02 10:21:46 -08:00
cnauroth c260d7ec78 HADOOP-12533. Introduce FileNotFoundException in WASB for read and seek API. Contributed by Dushyanth. 
(cherry picked from commit 28790692624177d89fb1e4f59e2f83a659fc3089)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
 2015-11-02 09:39:27 -08:00
Arpit Agarwal bb2ee9f8eb HDFS-9343. Empty caller context considered invalid. (Contributed by Mingliang Liu) 2015-11-01 15:35:11 -08:00
Sangjin Lee b2d6ea5e18 Updated the 2.6.2 final release date. 
(cherry picked from commit a4a6b5b4b4)
 2015-10-30 18:49:21 -07:00
Suresh Srinivas b8d586fd8a HADOOP-9242. Duplicate surefire plugin config in hadoop-common. Contributed by Andrey Klochkov. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1438213 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 16acd69e58)
 2015-10-30 14:27:45 -07:00
Jason Lowe 8dce482f61 Creating 2.6.3 entries in CHANGES.txt files. 
(cherry picked from commit eadf7b3096)
 2015-10-30 14:52:06 +00:00
Zhe Zhang 30791cb0d0 HDFS-9229. Expose size of NameNode directory as a metric. Contributed by Surendra Singh Lilhore. 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/EditLogTailer.java

Change-Id: I5f5895bac4f7d7e66e95788765a514b80b9b6766
 2015-10-29 11:21:57 -07:00
Jian He 7d109ef5b5 YARN-4288. Fixed RMProxy to retry on IOException from local host. Contributed by Junping Du 
(cherry picked from commit c41699965e)
 2015-10-29 00:01:20 -07:00
Vinayakumar B dea66a8392 HDFS-8545. Refactor FS#getUsed() to use ContentSummary and add an API to fetch the total file length from a specific path (Contributed by J.Andreina) 
(cherry picked from commit 7d2d16f4ee)
 2015-10-29 11:30:59 +05:30
Sangjin Lee 16db203a83 Set the release date for 2.6.2 2015-10-28 20:48:49 -07:00
cnauroth c7f87dc2d0 HADOOP-12519. hadoop-azure tests should avoid creating a metrics configuration fiale in the module root directory. Contributed by Chris Nauroth. 
(cherry picked from commit 2d10cb8e00)
 2015-10-28 09:44:21 -07:00
Steve Loughran fe079c8b20 HADOOP-12514. Make static fields in GenericTestUtils for assertExceptionContains() package-private and final. (Mingliang Liu via stevel) 2015-10-28 10:36:26 +00:00
cnauroth af0f2e27d1 HDFS-9311. Support optional offload of NameNode HA service health checks to a separate RPC server. Contributed by Chris Nauroth. 
(cherry picked from commit bf8e452982)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
 2015-10-27 23:08:32 -07:00
cnauroth 0377795e06 HADOOP-11685. StorageException complaining " no lease ID" during HBase distributed log splitting. Contributed by Duo Xu. 
(cherry picked from commit 1f7ecb0c84)
 2015-10-27 22:56:33 -07:00
cnauroth a23f79b92c HADOOP-12520. Use XInclude in hadoop-azure test configuration to isolate Azure Storage account keys for service integration tests. Contributed by Chris Nauroth. 
(cherry picked from commit 73822de7c3)
 2015-10-27 22:49:04 -07:00
Zhihai Xu 73612294bd HADOOP-12178. NPE during handling of SASL setup if problem with SASL resolver class. Contributed by Steve Loughran 
(cherry picked from commit ed9806ea40)
 2015-10-27 10:09:45 -07:00
Tsuyoshi Ozawa 1035637200 HADOOP-12457. [JDK8] Fix a failure of compiling common by javadoc. Contributed by Akira AJISAKA. 
(cherry picked from commit ea6b183a1a)

Conflicts:
	hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
 2015-10-27 10:58:50 +09:00
Jing Zhao 7d25646741 HADOOP-12472. Make GenericTestUtils.assertExceptionContains robust. Contributed by Steve Loughran. 
(cherry picked from commit a01a209fbe)
 2015-10-26 14:03:38 -07:00
Tsuyoshi Ozawa 07169e25ce HADOOP-12513. Dockerfile lacks initial 'apt-get update'. Contributed by Akihiro Suda. 
(cherry picked from commit 123b3db743)
 2015-10-26 23:19:14 +09:00
Tsuyoshi Ozawa e85ebf0825 YARN-3528. Tests with 12345 as hard-coded port break jenkins. Contributed by Brahma Reddy Battula. 
Conflicts:
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerShutdown.java
 2015-10-26 17:06:46 +09:00
Jitendra Pandey 63cebf57d0 HDFS-9184. Logging HDFS operation's caller context into audit logs. Contributed by Mingliang Liu. 2015-10-23 12:17:20 -07:00
Jonathan Eagles 6db7bfbcfd YARN-4009. CORS support for ResourceManager REST API. ( Varun Vasudev via jeagles) 
(cherry picked from commit f8adeb712d)
 2015-10-23 10:43:59 -05:00
Tsuyoshi Ozawa de739cabb1 HADOOP-7266. Deprecate metrics v1. Contributed by Akira AJISAKA. 
(cherry picked from commit 35a303dfbe)
 2015-10-23 23:48:36 +09:00
Tsuyoshi Ozawa 525a67a62e HADOOP-9692. Improving log message when SequenceFile reader throws EOFException on zero-length file. (Zhe Zhang and Chu Tong via ozawa) 2015-10-23 06:54:24 +09:00
Tsuyoshi Ozawa 7d4246a5da Revert "HADOOP-9692. Improving log message when SequenceFile reader throws EOFException on zero-length file. Contributed by Zhe Zhang and Chu Tong." 
This reverts commit 3ed9db0a38.
 2015-10-23 06:53:56 +09:00
cnauroth b023539c19 HADOOP-12484. Single File Rename Throws Incorrectly In Potential Race Condition Scenarios. Contributed by Gaurav Kanade. 
(cherry picked from commit cb282d5b89)
 2015-10-22 14:30:09 -07:00
Junping Du d5145b58f6 YARN-4243. Add retry on establishing Zookeeper conenction in EmbeddedElectorService#serviceInit. Contributed by Xuan Gong. 
(cherry picked from commit 0fce5f9a49)
 2015-10-22 13:42:12 -07:00
cnauroth 10398daadf HADOOP-12334. Change Mode Of Copy Operation of HBase WAL Archiving to bypass Azure Storage Throttling after retries. Contributed by Gaurav Kanade. 
(cherry picked from commit 47641fcbc9)
 2015-10-22 12:21:44 -07:00
Tsuyoshi Ozawa 3ed9db0a38 HADOOP-9692. Improving log message when SequenceFile reader throws EOFException on zero-length file. Contributed by Zhe Zhang and Chu Tong. 
(cherry picked from commit 381610da62)
 2015-10-22 11:59:25 +09:00
Andrew Wang 7a9b97e6b7 HADOOP-10406. TestIPC.testIpcWithReaderQueuing may fail. Contributed by Xiao Chen. 
(cherry picked from commit d1cdce77fa)
 2015-10-21 15:21:15 -07:00
Ming Ma 39e7548cd9 HDFS-8647. Abstract BlockManager's rack policy into BlockPlacementPolicy. (Brahma Reddy Battula via mingma) 
(cherry picked from commit e27c2ae8ba)
 2015-10-21 08:24:02 -07:00
Kihwal Lee e327233e80 HADOOP-12418. TestRPC.testRPCInterruptedSimple fails intermittently. Contributed Kihwal Lee. 
(cherry picked from commit 01b103f4ff)

Conflicts:
	hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java
 2015-10-20 15:19:01 -05:00
Kihwal Lee e86819c91f HADOOP-12464. Interrupted client may try to fail-over and retry. Contributed by Kihwal Lee. 
(cherry picked from commit 6144e0137b)
 2015-10-19 10:56:19 -05:00
Vinayakumar B b6dce3834d HADOOP-12460. Add overwrite option for 'get' shell command (Contributed by Jagadesh Kiran N) 
(cherry picked from commit 7f0e1eb43d)
 2015-10-19 12:16:44 +05:30
yliu 2c0dbf728a HADOOP-12483. Maintain wrapped SASL ordering for postponed IPC responses. (Daryn Sharp via yliu) 2015-10-19 09:52:39 +08:00
Steve Loughran f7d746a81b HADOOP-10941. Proxy user verification NPEs if remote host is unresolvable (Benoy Antony via stevel). 2015-10-18 14:05:17 +01:00
Steve Loughran b390aae467 HADOOP-12450. UserGroupInformation should not log at WARN level if no groups are found. (Elliott Clark via stevel) 2015-10-18 12:23:34 +01:00
Steve Loughran 10932aad29 HADOOP-11628. SPNEGO auth does not work with CNAMEs in JDK8. (Daryn Sharp via stevel). 2015-10-18 11:45:11 +01:00
cnauroth 6774a1732a HADOOP-12481. JWTRedirectAuthenticationHandler doesn't Retain Original Query String. Contributed by Larry McCay. 
(cherry picked from commit a121fa1d39)
 2015-10-15 16:45:08 -07:00
cnauroth adb015847d HADOOP-12479. ProtocMojo does not log the reason for a protoc compilation failure. Contributed by Chris Nauroth. 
(cherry picked from commit fdd7406224)
 2015-10-15 15:55:06 -07:00
Sangjin Lee afa57f1b48 HADOOP-12475. Replace guava Cache with ConcurrentHashMap for caching Connection in ipc Client (Walter Su via sjlee) 
(cherry picked from commit 8d2d3eb7bb)
 2015-10-15 11:49:03 -07:00
Steve Loughran 0e4fb329ed HADOOP-12478. Shell.getWinUtilsPath() has been renamed Shell.getWinutilsPath(). (stevel) 2015-10-14 20:25:33 +01:00
Colin Patrick Mccabe d37f88674f HDFS-9187. Fix null pointer error in Globber when FS was not constructed via FileSystem#createFileSystem (cmccabe) 
(cherry picked from commit d286032b71)
 2015-10-13 16:21:13 -07:00
Steve Loughran 5eab51a24f HADOOP-10775. Shell operations to fail with meaningful errors on windows if winutils.exe not found. (stevel) 2015-10-13 21:47:54 +01:00
Tsuyoshi Ozawa 171e54e12c HADOOP-11515. Upgrade jsch lib to jsch-0.1.51 to avoid problems running on java7. (stevel and ozawa) 
(cherry picked from commit 33fefa33e5)
 2015-10-14 05:32:01 +09:00
Haohui Mai 5c5362980c HDFS-9145. Tracking methods that hold FSNamesytemLock for too long. Contributed by Mingliang Liu. 2015-10-13 13:20:17 -07:00
Steve Loughran 38f86c0842 HADOOP-12449. TestDNS and TestNetUtils failing if no network. (stevel) 2015-10-13 21:13:41 +01:00
Haohui Mai 950e8a459e HADOOP-12474. MiniKMS should use random ports for Jetty server by default. Contributed by Mingliang Liu. 2015-10-13 13:08:03 -07:00
Colin Patrick Mccabe 535c903bc6 HADOOP-12344. Improve validateSocketPathSecurity0 error message (Casey Brotherton via Colin P. McCabe) 
(cherry picked from commit 6716f15964)
 2015-10-13 12:25:48 -07:00
Jitendra Pandey e7203b6954 HDFS-8855. Webhdfs client leaks active NameNode connections. Contributed by Xiaobing Zhou. 2015-10-13 09:14:01 -07:00
yliu 146f297d7d HADOOP-10300. Allowed deferred sending of call responses. (Daryn Sharp via yliu) 2015-10-12 16:05:47 +08:00
Haohui Mai f6b0fcdc75 Revert "HADOOP-12469. distcp shout not ignore the ignoreFailures option. Contributed by Mingliang Liu." 
This reverts commit a412edf5c4.
 2015-10-10 03:25:16 -07:00
Haohui Mai a412edf5c4 HADOOP-12469. distcp shout not ignore the ignoreFailures option. Contributed by Mingliang Liu. 2015-10-09 22:38:13 -07:00
Akira Ajisaka 2c6c9e315c HADOOP-11104. org.apache.hadoop.metrics2.lib.MetricsRegistry needs numerical parameter checking. Contributed by Ray Chiang. 
(cherry picked from commit e1bf8b3df6)
 2015-10-09 11:10:54 +09:00
Akira Ajisaka 613c7088fd HADOOP-12465. Incorrect javadoc in WritableUtils.java. Contributed by Jagadesh Kiran N. 
(cherry picked from commit 7fbf69bf47)
 2015-10-08 06:09:02 +09:00
Steve Loughran fa3e774295 HADOOP-12284. UserGroupInformation doAs can throw misleading exception (Aaron Dosset via stevel) 2015-10-06 21:39:33 +01:00
cnauroth 535762fadb HADOOP-12350. WASB Logging: Improve WASB Logging around deletes, reads and writes. Contributed by Dushyanth. 
(cherry picked from commit 5f6edb30c2)
 2015-10-05 20:12:33 -07:00
Colin Patrick Mccabe a509413c9a HADOOP-12452. Fix tracing documention reflecting the update to htrace-4 (Masatake Iwasaki via Colin P. McCabe) 
(cherry picked from commit 3e1752f9fb)
 2015-10-05 11:36:00 -07:00
Vinod Kumar Vavilapalli b876babdc7 HADOOP-12441. Fixed shell-kill command behaviour to work correctly on some Linux distributions after HADOOP-12317. Contributed by Wangda Tan. 
(cherry picked from commit f1c19b9365)
 2015-10-05 10:57:55 -07:00
Tsuyoshi Ozawa e6514c6a3b HADOOP-11098. [JDK8] Max Non Heap Memory default changed between JDK7 and 8. 
(cherry picked from commit 30e2f836a2)
 2015-10-05 08:15:40 +09:00
Harsh J 21b4ba48ce HADOOP-12458. Retries is typoed to spell Retires in parts of hadoop-yarn and hadoop-common. Contributed by Neelesh Srinivas Salian. 
(cherry picked from commit c918f7be5e)
 2015-10-03 18:39:22 +05:30
Jason Lowe 3e3733437f YARN-3619. ContainerMetrics unregisters during getMetrics and leads to ConcurrentModificationException. Contributed by Zhihai Xu 
(cherry picked from commit fdf02d1f26)
 2015-10-02 20:21:32 +00:00
Akira Ajisaka 966f9508c3 HADOOP-12230. hadoop-project declares duplicate, conflicting curator dependencies. Contributed by Rakesh R. 2015-10-02 12:40:05 +02:00
Zhihai Xu 07f9405692 HADOOP-8437. getLocalPathForWrite should throw IOException for invalid paths. Contributed by Brahma Reddy Battula 
(cherry picked from commit fd026f535c)
 2015-10-01 12:04:27 -07:00
Karthik Kambatla db145e0c9a HADOOP-12451. Setting HADOOP_HOME explicitly should be allowed. (kasha) 2015-10-01 11:29:50 -07:00
Akira Ajisaka c6f30e5913 HADOOP-10296. Incorrect null check in SwiftRestClient#buildException(). Contributed by Rahul Palamuttam and Kanaka Kumar Avvaru. 
(cherry picked from commit ecbfd68974)
 2015-10-01 18:35:19 +02:00
yliu 3625222635 HADOOP-12448. TestTextCommand: use mkdirs rather than mkdir to create test directory. (Contributed by Colin Patrick McCabe and Chris Nauroth) 2015-09-30 11:04:09 +08:00
Haohui Mai baa6ef0207 HDFS-9174. Fix findbugs warnings in FSOutputSummer.tracer and DirectoryScanner$ReportCompiler.currentThread. Contributed by Yi Liu. 2015-09-29 14:56:13 -07:00
Colin Patrick Mccabe 171bd1cb2b HADOOP-12447. Clean up some htrace integration issues (cmccabe) 
(cherry picked from commit 850d679acb)
 2015-09-29 09:38:10 -07:00
yliu 9c47ab32b1 HDFS-8859. Improve DataNode ReplicaMap memory footprint to save about 45%. (yliu) 2015-09-29 16:23:50 +08:00
Ming Ma ac7d85efb2 HADOOP-12440. TestRPC#testRPCServerShutdown did not produce the desired thread states before shutting down. (Xiao Chen via mingma) 
(cherry picked from commit 5c3b663bf9)
 2015-09-28 18:14:29 -07:00
Kihwal Lee 95b8f1f3a6 HADOOP-12446. Undeprecate createNonRecursive(). Contributed by Ted Yu. 
(cherry picked from commit 3abbdc929b)
 2015-09-28 17:33:20 -05:00
Colin Patrick Mccabe 3b9d32627f HDFS-9080. Update htrace version to 4.0.1 (cmccabe) 
(cherry picked from commit 892ade689f)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
        hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/BlockStorageLocationUtil.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
 2015-09-28 08:15:00 -07:00