Commit Graph

1871 Commits

Author SHA1 Message Date
Ravi Prakash 7b53ab7b14 HADOOP-11181. GraphiteSink emits wrong timestamps (Sascha Coenen via raviprak)
(cherry picked from commit 466f08792f)
2014-10-15 15:53:47 -07:00
Zhijie Shen eb055eadd7 YARN-2656. Made RM web services authentication filter support proxy user. Contributed by Varun Vasudev and Zhijie Shen.
(cherry picked from commit 1220bb72d4)
2014-10-14 21:58:12 -07:00
Zhijie Shen e71fa82ee5 HADOOP-11181. Generalized o.a.h.s.t.d.DelegationTokenManager to handle all sub-classes of AbstractDelegationTokenIdentifier. Contributed by Zhijie Shen.
(cherry picked from commit cdce88376a)
2014-10-14 11:39:06 -07:00
Haohui Mai 21fa0f6c43 HADOOP-11198. Fix typo in javadoc for FileSystem#listStatus(). Contributed by Li Lu. 2014-10-13 20:44:23 -07:00
Aaron T. Myers 834533fdfc HADOOP-11176. KMSClientProvider authentication fails when both currentUgi and loginUgi are a proxied user. Contributed by Arun Suresh.
(cherry picked from commit 0e57aa3bf6)
(cherry picked from commit f3132eee10)
2014-10-13 18:10:40 -07:00
Karthik Kambatla e6102b1828 YARN-2566. DefaultContainerExecutor should pick a working directory randomly. (Zhihai Xu via kasha)
(cherry picked from commit cc93e7e683)

Conflicts:
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java
2014-10-13 16:42:47 -07:00
Haohui Mai edf2497df7 HADOOP-11193. Fix uninitialized variables in NativeIO.c. Contributed by Xiaoyu Yao. 2014-10-10 23:04:19 -07:00
Uma Maheswara Rao G 157f86fca5 HADOOP-11133. Should trim the content of keystore password file for JavaKeyStoreProvider (Yi Liu via umamahesh)
(cherry picked from commit 8d7c54967d)
2014-10-10 23:04:12 -07:00
Colin Patrick Mccabe 14080ea3d2 HADOOP-11184. Update Hadoop's lz4 to r123 (cmccabe)
(cherry picked from commit d8d628d1e0)
(cherry picked from commit 8addbe2b8e)
2014-10-09 17:12:48 -07:00
Andrew Wang 2ff182c890 HADOOP-11174. Delegation token for KMS should only be got once if it already exists. (Yi Liu via wang)
(cherry picked from commit 8d94114495)
2014-10-09 13:21:34 -07:00
Andrew Wang e7b215dfa7 HADOOP-11178. Fix findbugs exclude file. (Arun Suresh via wang)
(cherry picked from commit d7b647f0ee)
2014-10-09 11:59:15 -07:00
cnauroth 754718aed5 HDFS-7195. Update user doc of secure mode about Datanodes don't require root or jsvc. Contributed by Chris Nauroth.
(cherry picked from commit 4e544c84e9)
2014-10-09 11:57:00 -07:00
cnauroth cf7eaf28e9 HADOOP-11175. Fix several issues of hadoop security configuration in user doc. Contributed by Yi Liu.
(cherry picked from commit 1123a06e36)
(cherry picked from commit 5af4c021cc)
2014-10-09 11:12:58 -07:00
Aaron T. Myers f86c9c6c71 HADOOP-11161. Expose close method in KeyProvider to give clients of Provider implementations a hook to release resources. Contribued by Arun Suresh.
(cherry picked from commit d9556e873ef4d3e68c4f0c991f856d1faa747f07)
(cherry picked from commit 3a2565c7be80cf6e9cdfec0f5460ed8ed2252768)
2014-10-08 18:00:37 -07:00
Zhijie Shen ab448565c9 HADOOP-11179. Java untar should handle the case that the file entry comes without its parent directory entry. Contributed by Craig Welch.
(cherry picked from commit a169051931)
2014-10-08 15:39:30 -07:00
Colin Patrick Mccabe 204148f0d4 HADOOP-10404. Some accesses to DomainSocketWatcher#closed are not protected by the lock (cmccabe) 2014-10-08 13:58:28 -07:00
Andrew Wang 2c27b7b26f HADOOP-11169. Fix DelegationTokenAuthenticatedURL to pass the connection Configurator to the authenticator. (Arun Suresh via wang)
(cherry picked from commit b2f6197523)
2014-10-07 14:51:52 -07:00
Kihwal Lee 3f200fddfd HADOOP-11007. Reinstate building of ant tasks support. Contributed by
Jason Lowe.
(cherry picked from commit 99d7a452be)
2014-10-07 16:24:23 -05:00
Haohui Mai 1bd45fa165 HADOOP-11168. Remove duplicated entry dfs.webhdfs.enabled in the user doc. Contributed by Yi Liu. 2014-10-06 22:08:01 -06:00
cnauroth 08ccd30063 HADOOP-11163. Correct CHANGES.txt.
(cherry picked from commit bbb3b1acc0)
(cherry picked from commit 1329d1e701)
2014-10-06 09:16:31 -07:00
cnauroth 29c203585e HADOOP-11163. MetricsSystemImpl may miss a registered source. Contributed by Chuan Liu.
(cherry picked from commit 69c9af9103)
(cherry picked from commit a828ef15b0)
2014-10-06 09:16:22 -07:00
Arun C. Murthy e65d8b750d HADOOP-10731. Sync-ing CHANGES.txt across branches.
(cherry picked from commit c5828c624f)
2014-10-05 07:51:56 -07:00
Arun C. Murthy c39f74d041 HADOOP-10681. Remove unnecessary synchronization from Snappy & Zlib codecs. Contributed by Gopal Vijayaraghavan.
(cherry picked from commit 8f9ab998e2)
2014-10-05 07:47:28 -07:00
Andrew Wang ac510c3610 HADOOP-11151. Automatically refresh auth token and retry on auth failure. Contributed by Arun Suresh.
(cherry picked from commit 2d8e6e2c4a)
(cherry picked from commit 9ebff016c2)
2014-10-02 20:00:22 -07:00
Haohui Mai cfc5f8f684 HADOOP-11160. Fix typo in nfs3 server duplicate entry reporting. Contributed by Charles Lamb. 2014-10-02 14:27:33 -07:00
Andrew Wang dea3f133ff HDFS-7181. Remove incorrect precondition check on key length in FileEncryptionInfo. (wang)
(cherry picked from commit 6ac10516e7)
(cherry picked from commit 6dbba19469)
2014-10-02 14:01:30 -07:00
Steve Loughran a19efe3b13 HADOOP-11117 UGI HadoopLoginModule doesn't catch & wrap all kerberos-related exceptions (stevel) 2014-09-30 17:40:53 -07:00
Andrew Wang e2351e8512 HADOOP-11113. Namenode not able to reconnect to KMS after KMS restart. (Arun Suresh via wang)
(cherry picked from commit e25a25c5343c889d8c9e45b65082ddb55cf36d52)
2014-09-30 16:48:27 -07:00
Arun C. Murthy d3e61c96b5 Branching for hadoop-2.6 2014-09-30 10:38:47 -07:00
Arun C. Murthy 6a60fa279a Preparing to branch hadoop-2.6 2014-09-30 10:37:03 -07:00
cnauroth 57b145c3ab HADOOP-11145. TestFairCallQueue fails. Contributed by Akira AJISAKA.
(cherry picked from commit b9158697a4)
2014-09-30 08:58:39 -07:00
cnauroth 781833f553 HADOOP-11154. Update BUILDING.txt to state that CMake 3.0 or newer is required on Mac. Contributed by Chris Nauroth.
(cherry picked from commit 8dc4e9408f)
2014-09-30 08:35:35 -07:00
Brandon Li aa3d6d374d HADOOP-11130. NFS updateMaps OS check is reversed. Contributed by Brandon Li
(cherry picked from commit c88c6c57aa)
2014-09-29 15:08:19 -07:00
Andrew Wang 758fb8465a HADOOP-11153. Make number of KMS threads configurable. (wang)
(cherry picked from commit 64aef18965)
2014-09-29 15:04:26 -07:00
Andrew Wang 47ddaee1db HDFS-7122. Use of ThreadLocal<Random> results in poor block placement. (wang)
(cherry picked from commit d7086c563ff2847c415913ac625b2a557eeccbdd)
2014-09-29 15:00:28 -07:00
Andrew Wang d551a95fc4 Move HDFS-7157 to HDFS CHANGES.txt
(cherry picked from commit a45b331cc9)
2014-09-29 13:17:28 -07:00
Andrew Wang 2028414ebe HADOOP-11110. JavaKeystoreProvider should not report a key as created if it was not flushed to the backing file. (Arun Suresh via wang)
(cherry picked from commit a78953c974)
2014-09-29 13:10:35 -07:00
Colin Patrick Mccabe c412652820 HDFS-7157. Using Time.now() for recording start/end time of reconfiguration tasks (Lei Xu via Colin Patrick McCabe)
(cherry picked from commit b3d5d269a7)
2014-09-29 11:30:32 -07:00
Jason Lowe 0cfff28f57 HADOOP-11049. javax package system class default is too broad. Contributed by Sangjin Lee
(cherry picked from commit cf4631d7c9)
2014-09-29 14:37:28 +00:00
Steve Loughran 7fabec3258 HADOOP-11143 NetUtils.wrapException loses inner stack trace on BindException 2014-09-27 21:06:31 +01:00
Jian He a6879b606e MAPREDUCE-6087. Fixed wrong config name of MRJobConfig#MR_CLIENT_TO_AM_IPC_MAX_RETRIES_ON_TIMEOUTS. Contributed by Akira AJISAKA
(cherry picked from commit 5f16c98ad6)
2014-09-26 18:06:19 -07:00
Allen Wittenauer 0341c65519 HADOOP-10552. Fix usage and example at FileSystemShell.apt.vm (Kenji Kikushima via aw) 2014-09-26 14:57:20 -07:00
Allen Wittenauer f894d187ed HADOOP-10731. Remove @date JavaDoc comment in ProgramDriver class (Henry Saputra via aw) 2014-09-26 14:41:53 -07:00
Allen Wittenauer 67d6fc3f01 MAPREDUCE-5945. Update the description of GenericOptionsParser -jt option (Akira AJISAKA via aw) 2014-09-26 14:26:36 -07:00
Jason Lowe 50a5227dad HADOOP-11048. user/custom LogManager fails to load if the client classloader is enabled. Contributed by Sangjin Lee
(cherry picked from commit f154ebe8c4)
2014-09-26 19:51:18 +00:00
Allen Wittenauer 27f9edceed HADOOP-10954. Adding site documents of hadoop-tools (Masatake Iwasaki via aw) 2014-09-26 12:01:41 -07:00
Allen Wittenauer 424b1f6955 HADOOP-8808. Update FsShell documentation to mention deprecation of some of the commands, and mention alternatives (Akira AJISAKA via aw) 2014-09-26 11:11:30 -07:00
Colin Patrick Mccabe b5b4cb4d64 HDFS-6956. Allow dynamically changing the tracing level in Hadoop servers (cmccabe)
(cherry picked from commit 55302ccfba)
2014-09-26 10:34:42 -07:00
Andrew Wang 0eaa4ba026 HADOOP-11140. hadoop-aws only need test-scoped dependency on hadoop-common's tests jar. Contributed by Juan Yu.
(cherry picked from commit 4ea77efa3a)
2014-09-25 21:56:35 -07:00
Andrew Wang 3f71a15813 HDFS-7077. Separate CipherSuite from crypto protocol version. (wang)
(cherry picked from commit e96ce6f3e3)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
2014-09-25 18:42:17 -07:00
Tsz-Wo Nicholas Sze 022474c807 Merge branch 'HDFS-6584' into trunk
Conflicts:
	hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Dispatcher.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/NameNodeConnector.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestReplicationPolicy.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestReplicationPolicyConsiderLoad.java
2014-09-26 04:47:25 +08:00
Colin Patrick Mccabe cb9283549f HDFS-6808. Add command line option to ask DataNode reload configuration. (Lei Xu via Colin McCabe)
(cherry picked from commit 1861b32eb5)
2014-09-25 13:22:35 -07:00
Vinayakumar B 1e097ba429 HADOOP-11101. How about inputstream close statement from catch block to finally block in FileContext#copy() ( Contributed by skrho )
(cherry picked from commit dff95f7af8)
2014-09-25 12:47:41 +05:30
Allen Wittenauer ea1fb1461a HADOOP-11009. Add Timestamp Preservation to DistCp (Gary Steelman via aw) 2014-09-24 15:39:55 -07:00
cnauroth 6e5194099c HADOOP-11064. UnsatisifedLinkError with hadoop 2.4 JARs on hadoop-2.6 due to NativeCRC32 method changes. Contributed by Chris Nauroth.
(cherry picked from commit cbf0ae742a)
2014-09-24 15:33:18 -07:00
Andrew Wang 3cf28210ec HDFS-6987. Move CipherSuite xattr information up to the encryption zone root. (Zhe Zhang via wang) 2014-09-24 12:11:45 -07:00
Karthik Kambatla b34858c1f8 HADOOP-11017. Addendum to fix RM HA. KMS delegation token secret manager should be able to use zookeeper as store. (Arun Suresh via kasha)
(cherry picked from commit ef784a2e08)
2014-09-23 17:08:23 -07:00
Steve Loughran 273fb3a78c HADOOP-11111 MiniKDC to use locale EN_US for case conversions: hadoop-common/CHANGES.TXT 2014-09-23 10:56:55 +01:00
Vinayakumar B 1fe3086bdb HADOOP-10131. NetWorkTopology#countNumOfAvailableNodes() is returning wrong value if excluded nodes passed are not part of the cluster tree (Contributed by Vinayakumar B)
(cherry picked from commit eab15af12c)
2014-09-22 11:29:04 +05:30
Alejandro Abdelnur 897ced1a20 HADOOP-11017. KMS delegation token secret manager should be able to use zookeeper as store. (asuresh via tucu)
(cherry picked from commit db890eef32)

Conflicts:
	hadoop-project/pom.xml
2014-09-20 08:24:34 -07:00
cnauroth cadba3067f HDFS-7073. Allow falling back to a non-SASL connection on DataTransferProtocol in several edge cases. Contributed by Chris Nauroth.
(cherry picked from commit f85cc14eb4)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Dispatcher.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/NameNodeConnector.java
2014-09-19 22:04:13 -07:00
Andrew Wang eec927f3fc HADOOP-11112. TestKMSWithZK does not use KEY_PROVIDER_URI. (tucu via wang)
(cherry picked from commit b6ceef90e5)
2014-09-19 17:42:11 -07:00
Andrew Wang ee508c1b32 HADOOP-10970. Cleanup KMS configuration keys. (wang)
(cherry picked from commit adf0b67a71)
2014-09-19 15:03:26 -07:00
Allen Wittenauer 5f6129feb4 HADOOP-10946. Fix a bunch of typos in log messages (Ray Chiang via aw) 2014-09-19 11:32:00 -07:00
Andrew Wang 58d9cc0914 HDFS-6840. Clients are always sent to the same datanode when read is off rack. (wang)
(cherry picked from commit 8e73084491)
2014-09-18 18:14:10 -07:00
Aaron T. Myers 71e6a4a735 HADOOP-11109. Site build is broken. Contributed by Jian He.
(cherry picked from commit 0e2b64f2029cabbbf05a132625244427f8bf9518)
2014-09-18 18:00:07 -07:00
Alejandro Abdelnur 22f4ef4fa9 KMS: Support for multiple Kerberos principals. (tucu)
(cherry picked from commit fad4cd85b3)
2014-09-18 16:04:18 -07:00
cnauroth 039f56e739 HADOOP-11105. Update CHANGES.txt.
(cherry picked from commit 1b4b46004a)
2014-09-18 15:41:57 -07:00
cnauroth bf26b9be39 HADOOP-11105. MetricsSystemImpl could leak memory in registered callbacks. Contributed by Chuan Liu.
(cherry picked from commit 1942364ef1)
2014-09-18 15:38:38 -07:00
Andrew Wang 5bc71071d1 HADOOP-11106. Document considerations of HAR and Encryption. (clamb via wang)
(cherry picked from commit fe2f54d4cb)
2014-09-18 14:51:27 -07:00
Andrew Wang b05da10d0d Move some HDFS JIRAs to the correct CHANGES.txt 2014-09-17 18:08:24 -07:00
Andrew Wang a3aab30d6f HADOOP-11040. Return value of read(ByteBuffer buf) in CryptoInputStream is incorrect in some cases. (Yi Liu via wang)
(cherry picked from commit 47e5e19831)
2014-09-17 18:03:06 -07:00
Alejandro Abdelnur d3efebf4aa HADOOP-11016. KMS should support signing cookies with zookeeper secret manager. (tucu)
(cherry picked from commit 123f20d42f)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
2014-09-17 15:30:56 -07:00
Colin Patrick Mccabe 0ad613c369 HDFS-7075. hadoop-fuse-dfs fails because it cannot find JavaKeyStoreProvider$Factory. (cmccabe)
(cherry picked from commit f230248525)
2014-09-17 14:28:05 -07:00
Colin Patrick Mccabe 6cb8ed0d22 HDFS-6843. Create FileStatus isEncrypted() method (clamb via cmccabe)
(cherry picked from commit e3803d002c)
2014-09-17 13:36:41 -07:00
Alejandro Abdelnur 6857c291af HADOOP-11099. KMS return HTTP UNAUTHORIZED 401 on ACL failure. (tucu)
(cherry picked from commit e4ddb6da15)
2014-09-17 11:08:25 -07:00
Alejandro Abdelnur 1c847fdd61 HADOOP-11062. CryptoCodec testcases requiring OpenSSL should be run only if -Pnative is used. (asuresh via tucu)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/pom.xml
2014-09-16 23:37:21 -07:00
Alejandro Abdelnur 75bd79231c HADOOP-11097. kms docs say proxyusers, not proxyuser for config params. (clamb via tucu) 2014-09-16 23:21:17 -07:00
Alejandro Abdelnur 94a1e68aa5 HADOOP-11096. KMS: KeyAuthorizationKeyProvider should verify the keyversion belongs to the keyname on decrypt. (tucu) 2014-09-16 23:21:17 -07:00
Andrew Wang aeac86bc8a HADOOP-10922. User documentation for CredentialShell. Contributed by Larry McCay.
(cherry picked from commit b6d3230e41)
2014-09-16 17:15:37 -07:00
Alejandro Abdelnur e59f6771e8 HADOOP-10868. AuthenticationFilter should support externalizing the secret for signing and provide rotation support. (rkanter via tucu) 2014-09-15 17:10:43 -07:00
Colin Patrick Mccabe f80b10e1e7 HADOOP-11091. Eliminate old configuration parameter names from s3a (dsw via cmccabe)
(cherry picked from commit 0ac760a58d)
2014-09-15 16:50:10 -07:00
Colin Patrick Mccabe b4d9aca066 HDFS-6912. SharedFileDescriptorFactory should not allocate sparse files (cmccabe)
(cherry picked from commit 8008f0e819)
2014-09-15 14:51:59 -07:00
Kihwal Lee e6e31fbbba HDFS-7059. HAadmin transtionToActive with forceActive option can show
confusing message. Contributed by Rushabh Shah.
(cherry picked from commit 2f847b3357)
2014-09-15 16:30:22 -05:00
Jian He 1c3f837835 YARN-2529. Generic history service RPC interface doesn't work when service authorization is enabled. Contributed by Zhijie Shen
(cherry picked from commit 88e329fdfb)
2014-09-15 13:15:07 -07:00
Aaron T. Myers a0c54aeb00 HADOOP-10400. Incorporate new S3A FileSystem implementation. Contributed by Jordan Mendelson and Dave Wang. 2014-09-15 08:30:42 -07:00
cnauroth 5afc3f1dad HADOOP-11088. Unittest TestKeyShell, TestCredShell and TestKMS assume UNIX path separator for JECKS key store path. Contributed by Xiaoyu Yao.
(cherry picked from commit 957414d4cb)
2014-09-12 14:50:37 -07:00
Karthik Kambatla d22cd065ed Update CHANGES.txt to set the release date for 2.5.1
(cherry picked from commit 17ffbe0864)
2014-09-11 17:36:06 -07:00
Colin Patrick Mccabe 5e4cb3d04c HADOOP-11074. Move s3-related FS connector code to hadoop-aws. (David S. Wang via Colin Patrick McCabe)
(cherry picked from commit 5ec7fcd9dd)
2014-09-11 15:00:47 -07:00
Alejandro Abdelnur 2924de58ce HADOOP-11083. After refactoring of HTTP proxyuser to common, doAs param is case sensitive. (tucu) 2014-09-11 13:54:59 -07:00
Jason Lowe b4ab7aa110 HADOOP-11085. Excessive logging by org.apache.hadoop.util.Progress when value is NaN. Contributed by Mit Desai
(cherry picked from commit 581176cdc8)
2014-09-11 19:54:05 +00:00
Steve Loughran fb804ed46c HADOOP-10373 create tools/hadoop-amazon for aws/EMR support (stevel)
(cherry picked from commit 59384dfb71)
2014-09-11 11:43:52 -07:00
Steve Loughran 731de8ec45 HADOOP-9540. Expose the InMemoryS3 and S3N FilesystemStores implementations for Unit testing. Hari
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1479985 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit fa56ccfd53)
2014-09-11 11:27:12 -07:00
Alejandro Abdelnur 88e5549d90 HADOOP-10758. KMS: add ACLs on per key basis. (tucu) 2014-09-10 14:27:22 -07:00
Alejandro Abdelnur e42b889bdb HADOOP-9989. Bug introduced in HADOOP-9374, which parses the -tokenCacheFile as binary file but set it to the configuration as JSON file. (zxu via tucu) 2014-09-09 22:20:49 -07:00
Alejandro Abdelnur d0e2116502 HADOOP-11077. NPE if hosts not specified in ProxyUsers. (gchanan via tucu) 2014-09-09 22:20:43 -07:00
cnauroth 7d9c45f778 HADOOP-11057. checknative command to probe for winutils.exe on windows. Contributed by Xiaoyu Yao.
(cherry picked from commit 6dae4b430c)
2014-09-09 21:39:11 -07:00
cnauroth ba44099f8e HADOOP-10925. Change attribution in CHANGES.txt from trunk to 2.6.0.
(cherry picked from commit 3e8f353c8e)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
2014-09-09 14:17:44 -07:00
Chris Nauroth b601e69d9d HADOOP-10925 Compilation fails in native link0 function on Windows. 2014-09-09 16:25:14 +01:00
Colin McCabe da118bb113 HDFS-6482. Use block ID-based block layout on datanodes (James Thomas via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615223 13f79535-47bb-0310-9956-ffa450edef68

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java
2014-09-08 22:00:51 -07:00