Commit Graph

2466 Commits

Author SHA1 Message Date
Kihwal Lee 3f3829e3a8 HADOOP-12464. Interrupted client may try to fail-over and retry. Contributed by Kihwal Lee.
(cherry picked from commit 6144e0137b)

Conflicts:
	hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryInvocationHandler.java
2015-10-19 11:00:48 -05:00
Akira Ajisaka aa0231f921 HADOOP-12465. Incorrect javadoc in WritableUtils.java. Contributed by Jagadesh Kiran N.
(cherry picked from commit 7fbf69bf47)
(cherry picked from commit 613c7088fd)
2015-10-08 06:09:32 +09:00
Jason Lowe 9f6ed41b95 YARN-3619. ContainerMetrics unregisters during getMetrics and leads to ConcurrentModificationException. Contributed by Zhihai Xu 2015-10-02 20:19:14 +00:00
Akira Ajisaka 3249c3ce56 HADOOP-12230. hadoop-project declares duplicate, conflicting curator dependencies. Contributed by Rakesh R.
(cherry picked from commit 966f9508c3)
2015-10-02 12:40:35 +02:00
Karthik Kambatla 49ff1e5276 HADOOP-12451. Setting HADOOP_HOME explicitly should be allowed. (kasha)
(cherry picked from commit db145e0c9a)

Conflicts:
	hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh
2015-10-01 11:36:12 -07:00
Vinod Kumar Vavilapalli (I am also known as @tshooter.) 2b4c7fcc67 Release process for 2.6.1: Set the release date for 2.6.1
(cherry picked from commit 1f707ecffd)
(cherry picked from commit f48af332a7)
2015-09-23 15:13:09 -07:00
Jason Lowe 521196874c MAPREDUCE-6481. LineRecordReader may give incomplete record and wrong position/key information for uncompressed input sometimes. Contributed by Zhihai Xu
(cherry picked from commit 58d1a02b8d)

Conflicts:

	hadoop-mapreduce-project/CHANGES.txt
2015-09-18 15:10:38 +00:00
Jason Lowe 850d6a3fd3 MAPREDUCE-5948. org.apache.hadoop.mapred.LineRecordReader does not handle multibyte record delimiters well. Contributed by Vinayakumar B, Rushabh Shah, and Akira AJISAKA
(cherry picked from commit 077250d8d7)

Conflicts:

	hadoop-mapreduce-project/CHANGES.txt
2015-09-18 15:04:02 +00:00
Jian He 30569d930f YARN-4153. TestAsyncDispatcher failed at branch-2.7. Contributed by Zhihai Xu 2015-09-14 17:48:31 +08:00
Vinod Kumar Vavilapalli (I am also known as @tshooter.) c05ba079e3 Updating all CHANGES.txt files to move entires from future releases into 2.6.1
section given the large number of backports to 2.6.1.

(cherry picked from commit fbbb7ff1ed)
(cherry picked from commit cbf90f93f9)
2015-09-10 16:10:56 -07:00
Colin Patrick Mccabe fb06549e9d HADOOP-12280. Skip unit tests based on maven profile rather than NativeCodeLoader.isNativeCodeLoaded (Masatake Iwasaki via Colin P. McCabe)
(cherry picked from commit 6f83274afc)
(cherry picked from commit e92107b18f)
(cherry picked from commit 3bd9b7459b)
2015-09-10 11:56:30 -07:00
Harsh J 6ab1a9c2de HADOOP-8151. Error handling in snappy decompressor throws invalid exceptions. Contributed by Matt Foley. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1389006 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit ac31d6a448)

Conflicts:

	hadoop-common-project/hadoop-common/CHANGES.txt

(cherry picked from commit 55427fb66c)
2015-09-10 11:56:29 -07:00
Gera Shegalov afa8189a07 HADOOP-11491. HarFs incorrectly declared as requiring an authority. (Brahma Reddy Battula via gera)
(cherry picked from commit f343f8657e)
(cherry picked from commit 58970d69de)
2015-09-10 10:57:52 -07:00
Gera Shegalov d3f41f6ed8 HADOOP-11812. Implement listLocatedStatus for ViewFileSystem to speed up split calculation (gera)
(cherry picked from commit 6d2cf9fbbd)
(cherry picked from commit 1544c63602)
2015-09-10 10:56:15 -07:00
Tsuyoshi Ozawa 76cfdb1aba HADOOP-12213. Interrupted exception can occur when Client#stop is called. Contributed by Kuhu Shukla.
(cherry picked from commit 0ebc658105)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
2015-09-03 23:34:12 +09:00
Tsuyoshi Ozawa d09ddb7898 HADOOP-12006. Remove unimplemented option for from document in branch-2.7. Contributed by Akira AJISAKA. 2015-09-03 23:07:40 +09:00
Jian He 2d1ff2e1ca YARN-4101. RM should print alert messages if Zookeeper and Resourcemanager gets connection issue. Contributed by Xuan Gong
(cherry picked from commit 09c64ba1ba)
2015-09-02 17:46:24 -07:00
Tsuyoshi Ozawa 6078172fee HADOOP-10365. BufferedOutputStream in FileUtil#unpackEntries() should be closed in finally block. Contributed by Kiran Kumar M R and Sanghyun Yun.
(cherry picked from commit dd149adeac)
2015-09-02 02:02:28 +09:00
Akira Ajisaka bcb98ba081 HADOOP-12359. hadoop fs -getmerge doc is wrong. Contributed by Jagadesh Kiran N.
(cherry picked from commit 2e251a7674)
(cherry picked from commit 236c4ab511)
2015-09-01 20:57:10 +09:00
Vinod Kumar Vavilapalli 9faee040f9 Creating 2.6.2 entries in CHANGES.txt files.
(cherry picked from commit 33474939a0)
2015-08-20 17:39:29 -07:00
Akira Ajisaka a2299bf4ee HADOOP-12061. Incorrect command in single cluster setup document. Contributed by Kengo Seki.
(cherry picked from commit 5fb8ac18d1)
2015-08-20 11:11:38 +09:00
Vinayakumar B ca3215a71b HADOOP-7139. Allow appending to existing SequenceFiles (Contributed by kanaka kumar avvaru)
Moved to 2.6.1

(cherry picked from commit fc508b41a9)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
2015-08-14 15:57:40 +05:30
Vinayakumar B b3546b6034 HADOOP-7139. Allow appending to existing SequenceFiles (Contributed by kanaka kumar avvaru)
(cherry picked from commit 295d678be8)
(cherry picked from commit 80697e4f32)
2015-08-14 15:50:11 +05:30
Vinayakumar B d8d33055b0 HADOOP-11333. Fix deadlock in DomainSocketWatcher when the notification pipe is full (zhaoyunjiong via cmccabe)
Moved to 2.6.1

(cherry picked from commit 05ed69058f)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt

(cherry picked from commit 796b94df1e)
2015-08-14 12:56:25 +05:30
Vinayakumar B 8f4a09b607 HADOOP-10786. Fix UGI#reloginFromKeytab on Java 8. Contributed by Stephen Chu.
Moved CHANGES.txt entry to 2.6.1

(cherry picked from commit e7aa81394d)
2015-08-14 12:24:59 +05:30
Vinayakumar B a046f7e570 HADOOP-10786. Fix UGI#reloginFromKeytab on Java 8. Contributed by Stephen Chu.
Moved CHANGES.txt entry to 2.6.1

(cherry picked from commit d6050f06a3b7e049541b1cb4597c388abf00a5be)
2015-08-14 12:10:58 +05:30
Jian He c170f58a59 HADOOP-11932. MetricsSinkAdapter may hang when being stopped. Contributed by Brahma Reddy Battula
(cherry picked from commit f59612edd7)
2015-08-05 16:14:35 -07:00
cnauroth 015d868367 HADOOP-12304. Applications using FileContext fail with the default file system configured to be wasb/s3/etc. Contributed by Chris Nauroth.
(cherry picked from commit 3da0bedaec)
(cherry picked from commit b83d475252)
2015-08-05 14:57:03 -07:00
Haohui Mai 2fe3136612 HDFS-8767. RawLocalFileSystem.listStatus() returns null for UNIX pipefile. Contributed by kanaka kumar avvaru. 2015-07-16 15:25:32 -07:00
cnauroth 180d791541 HADOOP-12232. Upgrade Tomcat dependency to 6.0.44. Contributed by Chris Nauroth.
(cherry picked from commit 6b56f05b9ea3ee45abd5d00b14fab93a353b1332)
(cherry picked from commit 89f484e4aa0a8db779a02999109dae212db1054c)
2015-07-14 14:53:20 -07:00
Tsuyoshi Ozawa 0744a578e4 HADOOP-12191. Bzip2Factory is not thread safe. Contributed by Brahma Reddy Battula.
(cherry picked from commit 4084eaf943)
2015-07-14 19:15:56 +09:00
Vinayakumar B a292e9800b HADOOP-12186. ActiveStandbyElector shouldn't call monitorLockNodeAsync multiple times (Contributed by zhihai xu)
(cherry picked from commit 233cab89ad)
(cherry picked from commit 91d2c59968)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
2015-07-07 18:10:29 +05:30
Vinod Kumar Vavilapalli (I am also known as @tshooter.) dcafd3ccd2 Release process for 2.7.1: Set the release date for 2.7.1.
(cherry picked from commit bf89ddb9b8)
2015-07-06 16:41:38 -07:00
Vinod Kumar Vavilapalli a36f090c55 Preparing for 2.7.2 development: mvn versions:set -DnewVersion=2.7.2 2015-06-28 16:41:12 -07:00
Vinod Kumar Vavilapalli 2e99675c72 Adding release 2.7.2 to CHANGES.txt.
(cherry picked from commit aad6a7d5db)
2015-06-28 16:33:49 -07:00
Yongjun Zhang d06080bbb5 HADOOP-12103. Small refactoring of DelegationTokenAuthenticationFilter to allow code sharing. Contributed by Yongjun Zhang.
(cherry picked from commit 49f5d20efe)
2015-06-19 14:50:42 -07:00
Colin Patrick Mccabe e5f9703419 HADOOP-12100. ImmutableFsPermission should not override applyUmask since that method doesn't modify the FsPermission (Bibin A. Chundatt via Colin P. McCabe)
(cherry picked from commit 6e0a9f92fe)
(cherry picked from commit 2946e92f79)
2015-06-18 11:39:54 -07:00
Tsz-Wo Nicholas Sze 632cb542f6 HDFS-8361. Choose SSD over DISK in block placement. 2015-06-15 17:29:33 -07:00
Arpit Agarwal 105cadb421 HADOOP-12078. The default retry policy does not handle RetriableException correctly. (Contributed by Arpit Agarwal) 2015-06-09 20:58:55 -07:00
Akira Ajisaka 718dca4859 HADOOP-12058. Fix dead links to DistCp and Hadoop Archives pages. Contributed by Kazuho Fujii.
(cherry picked from commit dbed757cba)
(cherry picked from commit 1cccd1eeb3)
2015-06-05 01:47:01 +09:00
cnauroth 7489b128db HADOOP-11934. Use of JavaKeyStoreProvider in LdapGroupsMapping causes infinite loop. Contributed by Larry McCay.
(cherry picked from commit 860b8373c3)
(cherry picked from commit 33648268ce)
2015-05-28 15:02:10 -07:00
Arun Suresh 273d2f9753 HADOOP-11973. Ensure ZkDelegationTokenSecretManager namespace znodes get created with ACLs. (Gregory Chanan via asuresh)
(cherry picked from commit fd3cb533d2)
2015-05-19 11:37:57 -07:00
cnauroth 82530ba0f1 HADOOP-11966. Variable cygwin is undefined in hadoop-config.sh when executed through hadoop-daemon.sh. Contributed by Chris Nauroth.
(cherry picked from commit ddc4afeff2)
2015-05-13 12:26:02 -07:00
Zhijie Shen 071e21cacd YARN-3539. Updated timeline server documentation and marked REST APIs evolving. Contributed by Steve Loughran.
(cherry picked from commit fcd0702c10)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
2015-05-12 21:19:33 -07:00
Akira Ajisaka 8f1dd57e61 HADOOP-11663. Remove description about Java 6 from docs. Contributed by Masatake Iwasaki.
(cherry picked from commit b9cebfc0ba)
(cherry picked from commit 77587fe198)
2015-05-12 00:32:24 +09:00
Tsuyoshi Ozawa 919cbc19e9 HADOOP-9658. SnappyCodec#checkNativeCodeLoaded may unexpectedly fail when native code is not loaded. Contributed by Zhijie Shen.
(cherry picked from commit 76fa606e2d)
2015-05-04 17:06:08 +09:00
Wangda Tan 3389bac42a YARN-3006. Improve the error message when attempting manual failover with auto-failover enabled. (Akira AJISAKA via wangda)
(cherry picked from commit 7d46a806e7)
(cherry picked from commit 4151e5729a)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
2015-05-01 16:47:06 -07:00
Colin Patrick Mccabe 472fd563e4 HDFS-8213. DFSClient should use hdfs.client.htrace HTrace configuration prefix rather than hadoop.htrace (cmccabe)
(cherry picked from commit b82567d455)
(cherry picked from commit 9edea9507d)
2015-05-01 11:52:08 -07:00
Arun Suresh 91db060ccc HADOOP-11891. OsSecureRandom should lazily fill its reservoir (asuresh)
(cherry picked from commit f0db797be2)
2015-04-30 14:03:18 -07:00
Colin Patrick Mccabe 496afb5e1a HADOOP-11802. DomainSocketWatcher thread terminates sometimes after there is an I/O error during requestShortCircuitShm (cmccabe)
(cherry picked from commit a0e0a63209)
(cherry picked from commit 788b76761d)
2015-04-23 19:09:50 -07:00
Steve Loughran ecab7d2265 HADOOP-11730. Regression: s3n read failure recovery broken. (Takenori Sato via stevel) 2015-04-23 21:39:30 +01:00
cnauroth 37673268ef HADOOP-11872. "hadoop dfs" command prints message about using "yarn jar" on Windows(branch-2 only). Contributed by Varun Vasudev.
(cherry picked from commit d1253f695d)
2015-04-23 13:11:11 -07:00
Jason Lowe 2419861cac HADOOP-11868. Invalid user logins trigger large backtraces in server log. Contributed by Chang Li
(cherry picked from commit 0ebe84d30a)
2015-04-22 20:58:27 +00:00
Arpit Agarwal b17d365fa1 HDFS-8163. Using monotonicNow for block report scheduling causes test failures on recently restarted systems. (Arpit Agarwal) 2015-04-21 11:17:27 -07:00
Vinod Kumar Vavilapalli 7dd5f42a76 Set the release date for 2.7.0
(cherry picked from commit d52de61544)
2015-04-20 20:18:38 -07:00
Arpit Agarwal cc42ad03d9 HDFS-8179. DFSClient#getServerDefaults returns null within 1 hour of system start. (Contributed by Xiaoyu Yao) 2015-04-20 15:42:58 -07:00
Haohui Mai 7569289e99 HADOOP-11837. AuthenticationFilter should destroy SignerSecretProvider in Tomcat deployments. Contributed by Bowen Zhang. 2015-04-17 11:00:14 -07:00
Vinod Kumar Vavilapalli a7fa46c2e0 Preparing for 2.7.1 development: mvn versions:set 2015-04-09 14:13:30 -07:00
Vinod Kumar Vavilapalli 2b44fcaa53 Adding release 2.7.1 to CHANGES.txt
(cherry picked from commit 623fd46c1e)
2015-04-09 14:01:23 -07:00
Haohui Mai d665d11f99 HADOOP-11815. HttpServer2 should destroy SignerSecretProvider when it stops. Contributed by Rohith. 2015-04-09 10:58:31 -07:00
Arpit Agarwal ffa3f3a100 HADOOP-11801. Update BUILDING.txt for Ubuntu. (Contributed by Gabor Liptak) 2015-04-07 18:07:11 -07:00
cnauroth c6ad39e406 HADOOP-11796. Skip TestShellBasedIdMapping.testStaticMapUpdate on Windows. Contributed by Xiaoyu Yao.
(cherry picked from commit bd77a7c4d9)
(cherry picked from commit 6e70611819)
2015-04-07 14:47:52 -07:00
Vinod Kumar Vavilapalli 5387a289fc HADOOP-11776. Fixed the broken JDiff support in Hadoop 2. Contributed by Li Lu.
(cherry picked from commit 4b3948ea36)
2015-04-04 13:53:34 -07:00
Vinod Kumar Vavilapalli 996b0ca173 HADOOP-11377. Added Null.java without which jdiff completely flops. Contributed by Tsuyoshi Ozawa.
(cherry picked from commit 5370e7128b)
2015-04-04 13:48:58 -07:00
Brandon Li 1bde06aca2 HADOOP-11757. NFS gateway should shutdown when it can't start UDP or TCP server. Contributed by Brandon Li
(cherry picked from commit 60ce825a71)
(cherry picked from commit 8e2f1a93e4)
2015-04-01 17:09:20 -07:00
cnauroth aa326086cc HADOOP-11787. OpensslSecureRandom.c pthread_threadid_np usage signature is wrong on 32-bit Mac. Contributed by Kiran Kumar M R.
(cherry picked from commit a3a96a07fa)
(cherry picked from commit 726024faa5)
2015-04-01 11:40:25 -07:00
Haohui Mai 530c2ef91a HADOOP-11754. RM fails to start in non-secure mode due to authentication filter failure. Contributed by Haohui Mai. 2015-03-30 11:45:11 -07:00
Haohui Mai 3ec1ad9001 HADOOP-11761. Fix findbugs warnings in org.apache.hadoop.security.authentication. Contributed by Li Lu. 2015-03-30 11:09:25 -07:00
cnauroth b849a519cb HADOOP-11639. Clean up Windows native code compilation warnings related to Windows Secure Container Executor. Contributed by Remus Rusanu.
(cherry picked from commit 3836ad6c0b)
(cherry picked from commit eb7068c2c9)
2015-03-27 15:03:59 -07:00
cnauroth ae6a76d4da HADOOP-11691. X86 build of libwinutils is broken. Contributed by Kiran Kumar M R.
(cherry picked from commit af618f23a7)
(cherry picked from commit 36371cddd1)
2015-03-26 21:57:43 -07:00
cnauroth cf2bda8b76 HADOOP-11257. Update "hadoop jar" documentation to warn against using it for launching yarn jars, addendum to print warning to stderr. Contributed by Masatake Iwasaki.
(cherry picked from commit 1fd350fa8e)
2015-03-26 21:48:48 -07:00
Haohui Mai d481a8d79b HADOOP-11748. The secrets of auth cookies should not be specified in configuration in clear text. Contributed by Li Lu and Haohui Mai. 2015-03-26 17:35:54 -07:00
Arpit Agarwal c808d5fe55 HDFS-7824. GetContentSummary API and its namenode implementation for Storage Type Quota/Usage. (Contributed by Xiaoyu Yao) 2015-03-26 10:48:03 -07:00
Haohui Mai 2e9c690e90 Addendum for HADOOP-10670. 2015-03-25 12:31:03 -07:00
Haohui Mai 28095c26f7 HADOOP-10670. Allow AuthenticationFilters to load secret from signature secret files. Contributed by Kai Zheng. 2015-03-25 12:30:58 -07:00
Tsuyoshi Ozawa c8f2880f98 HADOOP-11738. Fix a link of Protocol Buffers 2.5 for download in BUILDING.txt. (ozawa)
(cherry picked from commit 323945b33a)
2015-03-25 18:03:06 +09:00
Tsuyoshi Ozawa 557dfe5c40 HADOOP-11014. Potential resource leak in JavaKeyStoreProvider due to unclosed stream. (ozawa)
(cherry picked from commit b351086ff6)
2015-03-25 17:00:07 +09:00
Tsuyoshi Ozawa 913fdea4e2 HADOOP-11609. Correct credential commands info in CommandsManual.html#credential. Contributed by Varun Saxena.
(cherry picked from commit 6e891a921e)
2015-03-24 20:58:13 +09:00
Brandon Li 6b9f2d9f39 HDFS-7942. NFS: support regexp grouping in nfs.exports.allowed.hosts. Contributed by Brandon Li
(cherry picked from commit 36af4a913c)
(cherry picked from commit 503d8e4164)
2015-03-23 10:13:11 -07:00
Tsuyoshi Ozawa 4821f0cdb7 HADOOP-11729. Fix link to cgroups doc in site.xml. Contributed by Masatake Iwasaki.
(cherry picked from commit 522c897146)
2015-03-19 23:09:22 +09:00
Haohui Mai 7129287efb HADOOP-10703. HttpServer2 creates multiple authentication filters. Contributed by Benoy Antony. 2015-03-18 22:33:24 -07:00
Colin Patrick Mccabe 84acee00fa HADOOP-9329. document native build dependencies in BUILDING.txt (Vijay Bhat via Colin P. McCabe)
(cherry picked from commit bf6295bed8)
(cherry picked from commit b02f77540c)
2015-03-18 19:15:40 -07:00
Tsuyoshi Ozawa 51c374ac19 HADOOP-11720. [JDK8] Fix javadoc errors caused by incorrect or illegal tags in hadoop-tools. Contributed by Akira AJISAKA.
(cherry picked from commit ef9946cd52)
2015-03-17 16:09:54 +09:00
Colin Patrick Mccabe 03b979b8a5 HADOOP-11714. Add more trace log4j messages to SpanReceiverHost (cmccabe)
(cherry picked from commit bf3275dbaa)
(cherry picked from commit eb4eb63de3)
2015-03-16 18:41:51 -07:00
cnauroth 3718207e46 Revert "HADOOP-11449 / HADOOP-10320 ; reverting patch 6cda3a7 which triggered regression in javadocs on some java8 compilers (stevel on behalf of cnauroth)"
This reverts commit fe7df5b4d8.

Conflicts:
	hadoop-common-project/hadoop-annotations/src/main/java/org/apache/hadoop/classification/InterfaceStability.java

(cherry picked from commit ef2a66b246)
2015-03-16 14:37:58 -07:00
Suresh Srinivas 473b445c48 HADOOP-8059. Add javadoc to InterfaceAudience and InterfaceStability. Contributed by Brandon Li.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1354684 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 24c4216bf0)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt

(cherry picked from commit 3a783fe38d)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
2015-03-16 14:22:45 -07:00
cnauroth 389b28033a HADOOP-11638. OpensslSecureRandom.c pthreads_thread_id should support FreeBSD and Solaris in addition to Linux. Contributed by Kiran Kumar M R.
(cherry picked from commit 72cd4e4a4e)
2015-03-16 14:07:05 -07:00
Tsuyoshi Ozawa f9c18fd610 HADOOP-11558. Fix dead links to doc of hadoop-tools. Contributed by Jean-Pierre Matsumoto.
(cherry picked from commit 79426f3334)
2015-03-15 14:30:22 +09:00
Tsuyoshi Ozawa e28e2e4f52 Revert "HADOOP-11558. Fix dead links to doc of hadoop-tools. Contributed by Masatake Iwasaki."
This reverts commit 815487b3cb.
2015-03-15 14:28:17 +09:00
Tsuyoshi Ozawa 815487b3cb HADOOP-11558. Fix dead links to doc of hadoop-tools. Contributed by Masatake Iwasaki.
(cherry picked from commit 7da136ecca)
2015-03-15 14:25:39 +09:00
yliu 5eac0a9ec0 HADOOP-11710. Make CryptoOutputStream behave like DFSOutputStream wrt synchronization. (Sean Busbey via yliu)
(cherry picked from commit 813c93cb25)
2015-03-15 14:20:18 +09:00
cnauroth 9bd865f06d HADOOP-11693. Azure Storage FileSystem rename operations are throttled too aggressively to complete HBase WAL archiving. Contributed by Duo Xu.
(cherry picked from commit 7a346bcb4f)
(cherry picked from commit dcc4850ff3)
2015-03-11 14:37:32 -07:00
Haohui Mai 245f7b2a77 HADOOP-11633. Convert remaining branch-2 .apt.vm files to markdown. Contributed by Masatake Iwasaki. 2015-03-11 14:31:16 -07:00
cnauroth 0fe5f5b5b8 HDFS-7491. Add incremental blockreport latency to DN metrics. Contributed by Ming Ma.
(cherry picked from commit fb34f45727)
(cherry picked from commit 5e99b7cd2f)
2015-03-11 14:12:06 -07:00
Gera Shegalov 3abf6681be DelegateToFileSystem erroneously uses default FS's port in constructor. (Brahma Reddy Battula via gera) 2015-03-10 14:38:39 -07:00
Haohui Mai bbaa1344a1 HADOOP-11686. MiniKDC cannot change ORG_NAME or ORG_DOMAIN. Contributed by Duo Zhang. 2015-03-09 11:08:57 -07:00
Tsuyoshi Ozawa 28f4e6b222 HADOOP-11602. Backport 'Fix toUpperCase/toLowerCase to use Locale.ENGLISH.' (ozawa)
(cherry picked from commit b46f9e72db)
2015-03-09 19:54:45 +09:00
Steve Loughran b8a2087951 HADOOP-11670. Regression: s3a auth setup broken. (Adam Budde via stevel) 2015-03-08 11:22:01 -07:00
cnauroth 02cadbd24b HADOOP-11642. Upgrade azure sdk version from 0.6.0 to 2.0.0. Contributed by Shashank Khandelwal and Ivan Mitic.
(cherry picked from commit 608ebd52ba)

Conflicts:
	hadoop-project/pom.xml
2015-03-06 15:29:22 -08:00
Jian He 6cef2c16de YARN-2190. Added CPU and memory limit options to the default container executor for Windows containers. Contributed by Chuan Liu
(cherry picked from commit 21101c01f2)
2015-03-06 14:18:56 -08:00
yliu b569c3ab1c HADOOP-11674. oneByteBuf in CryptoInputStream and CryptoOutputStream should be non static. (Sean Busbey via yliu) 2015-03-05 06:39:58 +08:00
Tsuyoshi Ozawa f805d48b19 HADOOP-11648. Set DomainSocketWatcher thread name explicitly. Contributed by Liang Xie.
(cherry picked from commit 74a4754d1c)
2015-03-05 16:06:37 +09:00
Karthik Kambatla 0d62e94887 YARN-3242. Asynchrony in ZK-close can lead to ZKRMStateStore watcher receiving events for old client. (Zhihai Xu via kasha)
(cherry picked from commit 8d88691d16)
2015-03-04 19:49:21 -08:00
Akira Ajisaka 31b3f84601 HADOOP-11666. Revert the format change of du output introduced by HADOOP-6857. Contributed by Byron Wong. 2015-03-03 21:46:28 -08:00
Steve Loughran 824c32de1a HADOOP-11183. Memory-based S3AOutputstream. (Thomas Demoor via stevel) 2015-03-03 16:18:39 -08:00
Gera Shegalov 5e235802de HADOOP-11605. FilterFileSystem#create with ChecksumOpt should propagate it to wrapped FS. (gera)
(cherry picked from commit b18d3830ac)
2015-03-02 18:16:58 -08:00
Steve Loughran fe7df5b4d8 HADOOP-11449 / HADOOP-10320 ; reverting patch 6cda3a7 which triggered regression in javadocs on some java8 compilers (stevel on behalf of cnauroth) 2015-03-02 18:15:24 -08:00
Akira Ajisaka fcd817afb0 HADOOP-11658. Externalize io.compression.codecs property. Contributed by Kai Zheng.
(cherry picked from commit 0650e1c56f2d87ca9bdc51d7d4678895f494464a)
2015-03-02 01:13:10 -08:00
Akira Ajisaka c40293c828 HADOOP-11615. Update ServiceLevelAuth.md for YARN. Contributed by Brahma Reddy Battula.
(cherry picked from commit dd9cd0797c)
2015-03-01 22:16:59 -08:00
Tsuyoshi Ozawa 3854b21c4c HADOOP-11634. Description of webhdfs' principal/keytab should switch places each other. Contributed by Brahma Reddy Battula.
(cherry picked from commit e9ac88aac7)
2015-03-02 04:18:39 +09:00
Akira Ajisaka 0e10c70445 Fixed CHANGES.txt for HADOOP-10976. 2015-02-28 17:16:52 -08:00
Akira Ajisaka f7a724ca9e HADOOP-10976. Backport "moving the source code of hadoop-tools docs to the directory under hadoop-tools" to branch-2. Contributed by Masatake Iwasaki.
(cherry picked from commit 9112f093cd)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
2015-02-28 17:06:58 -08:00
Tsuyoshi Ozawa 02df51497f HADOOP-11569. Provide Merge API for MapFile to merge multiple similar MapFiles to one MapFile. Contributed by Vinayakumar B.
(cherry picked from commit 48c7ee7553)
2015-02-27 17:46:29 +09:00
cnauroth 264c96777e HADOOP-9922. hadoop windows native build will fail in 32 bit machine. Contributed by Kiran Kumar M R.
(cherry picked from commit 2214dab60f)
2015-02-26 12:41:48 -08:00
Andrew Wang 0512e50d6e HADOOP-11620. Add support for load balancing across a group of KMS for HA. Contributed by Arun Suresh.
(cherry picked from commit 71385f9b70)
2015-02-25 21:17:44 -08:00
cnauroth 1bc4c6808d HADOOP-11629. WASB filesystem should not start BandwidthGaugeUpdater if fs.azure.skip.metrics set to true. Contributed by Shanyu Zhao.
(cherry picked from commit 5731c0e0d0)
2015-02-25 09:09:15 -08:00
Tsuyoshi Ozawa 75fd43be02 HADOOP-11632. Cleanup Find.java to remove SupressWarnings annotations. Contributed by Akira AJISAKA.
(cherry picked from commit ad8ed3e802)
2015-02-25 16:25:21 +09:00
Akira Ajisaka e97613b429 HADOOP-11480. Typo in hadoop-aws/index.md uses wrong scheme for test.fs.s3.name. Contributed by Ted Yu.
(cherry picked from commit 1a625b8158)
2015-02-24 17:13:35 -08:00
Colin Patrick Mccabe 343cffb0ea HADOOP-11495. Backport "convert site documentation from apt to markdown" to branch-2 (Masatake Iwasaki via Colin P. McCabe)
(cherry-picked from commit b6fc1f3e43)

Conflicts:
    hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm
    hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm
    hadoop-common-project/hadoop-common/src/site/apt/FileSystemShell.apt.vm
    hadoop-common-project/hadoop-common/src/site/apt/RackAwareness.apt.vm
    hadoop-common-project/hadoop-common/src/site/apt/SingleCluster.apt.vm
    hadoop-common-project/hadoop-common/src/site/apt/FileSystemShell.apt.vm
    hadoop-common-project/hadoop-common/src/site/apt/SecureMode.apt.vm
    hadoop-common-project/hadoop-common/src/site/apt/Tracing.apt.vm
    hadoop-project/src/site/site.xml
2015-02-24 15:48:58 -08:00
Gera Shegalov 62e0e67d49 HADOOP-11619. FTPFileSystem should override getDefaultPort. (Brahma Reddy Battula via gera)
(cherry picked from commit 1dba57271f)
2015-02-23 21:19:57 -08:00
Akira Ajisaka 6bbb051d38 HADOOP-8642. Document that io.native.lib.available only controls native bz2 and zlib compression codecs. (aajisaka)
(cherry picked from commit ab5976161f)
2015-02-23 17:35:46 -08:00
Haohui Mai 92acb0e4f4 HADOOP-10478. Fix new findbugs warnings in hadoop-maven-plugins. Contributed by Li Lu. 2015-02-23 16:38:10 -08:00
cnauroth 657a6e389b HDFS-7009. Active NN and standby NN have different live nodes. Contributed by Ming Ma.
(cherry picked from commit 769507bd7a)
2015-02-23 15:12:36 -08:00
Arpit Agarwal 83f779e49a HDFS-7806. Refactor: move StorageType from hadoop-hdfs to hadoop-common. (Contributed by Xiaoyu Yao) 2015-02-21 15:48:59 -08:00
Steve Loughran a36cad0522 HADOOP-11584 s3a file block size set to 0 in getFileStatus. (Brahma Reddy Battula via stevel) 2015-02-21 12:02:41 +00:00
Robert Kanter 199a853ed7 HADOOP-11612. Workaround for Curator's ChildReaper requiring Guava 15+. (rkanter)
(cherry picked from commit 6f0133039a)
2015-02-20 19:51:35 -08:00
cnauroth 187e081d5a HADOOP-11604. Prevent ConcurrentModificationException while closing domain sockets during shutdown of DomainSocketWatcher thread. Contributed by Chris Nauroth.
(cherry picked from commit 3c5ff0759c)
2015-02-20 13:07:36 -08:00
Steve Loughran 4276f8b315 HADOOP-11607. Reduce log spew in S3AFileSystem. (Lei (Eddy) Xu via stevel) 2015-02-20 20:51:00 +00:00
cnauroth e09ba94f28 HDFS-7773. Additional metrics in HDFS to be accessed via jmx. Contributed by Anu Engineer. 2015-02-20 12:38:34 -08:00
Haohui Mai da52fdb999 HADOOP-11231. Remove dead code in ServletUtil. Contributed by Li Lu. 2015-02-19 11:35:35 -08:00
Jason Lowe b1fc4ec57a HADOOP-9087. Queue size metric for metric sinks isn't actually maintained. Contributed by Akira AJISAKA
(cherry picked from commit f0f2992686)
2015-02-19 17:38:39 +00:00
yliu 000b9e6c24 HADOOP-11595. Add default implementation for AbstractFileSystem#truncate. (yliu) 2015-02-19 08:28:15 +08:00
Akira Ajisaka 10da1bfce2 HADOOP-11440. Use "test.build.data" instead of "build.test.dir" for testing in ClientBaseWithFixes. Contributed by Kengo Seki.
(cherry picked from commit 18fb421fab)
2015-02-18 17:56:02 -08:00
Akira Ajisaka 5a1531fff6 HADOOP-11545. ArrayIndexOutOfBoundsException is thrown with "hadoop credential list -provider". Contributed by Brahma Reddy Battula.
(cherry picked from commit 1714609919)
2015-02-18 11:18:21 -08:00
Tsuyoshi Ozawa f10335b08d HADOOP-11599. Client#getTimeout should use IPC_CLIENT_PING_DEFAULT when IPC_CLIENT_PING_KEY is not configured. Contributed by zhihai xu.
(cherry picked from commit 3f56a4cb0c)
2015-02-18 18:00:18 +09:00
Kihwal Lee 6c01e58619 HADOOP-11295. RPC Server Reader thread can't shutdown if RPCCallQueue is full. Contributed by Ming Ma.
(cherry picked from commit 685af8a3d0)
2015-02-18 17:44:11 +09:00
Steve Loughran 411c8a7cda HADOOP-11521. Make connection timeout configurable in s3a. (Thomas Demoor via stevel) 2015-02-17 20:00:00 +00:00
Steve Loughran f52fcdc2e0 HADOOP-11522. Update S3A Documentation. (Thomas Demoor via stevel) 2015-02-17 18:14:31 +00:00
Steve Loughran 701b96ca8e HADOOP-11570. S3AInputStream.close() downloads the remaining bytes of the object from S3. (Dan Hecht via stevel). 2015-02-17 16:36:32 +00:00
Tsuyoshi Ozawa 00fb0710b6 HADOOP-11600. Fix up source codes to be compiled with Guava 17.0. (ozawa)
(cherry picked from commit 2f0f756b26)
2015-02-17 21:57:58 +09:00
Vinayakumar B 005e1df540 HADOOP-11000. HAServiceProtocol's health state is incorrectly transitioned to SERVICE_NOT_RESPONDING (Contributed by Ming Ma)
(cherry picked from commit cf4b7f506d)
2015-02-17 15:19:44 +05:30
Tsuyoshi Ozawa b7836c18e4 HADOOP-11589. NetUtils.createSocketAddr should trim the input URI. Contributed by Rakesh R.
(cherry picked from commit ef950ea1c0)
2015-02-15 00:31:33 +09:00
Tsuyoshi Ozawa 481124bd61 Revert "HADOOP-11589. NetUtils.createSocketAddr should trim the input URI. Contributed by Rakesh R."
This reverts commit e082992e2a.
2015-02-15 00:31:15 +09:00
Tsuyoshi Ozawa e082992e2a HADOOP-11589. NetUtils.createSocketAddr should trim the input URI. Contributed by Rakesh R.
(cherry picked from commit 965ce9e24e)
2015-02-15 00:13:38 +09:00
Robert Kanter ebf6499498 HADOOP-11467. KerberosAuthenticator can connect to a non-secure cluster. (yzhangal via rkanter)
(cherry picked from commit 875256834b)

Conflicts:
	hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestAuthenticationToken.java
	hadoop-common-project/hadoop-common/CHANGES.txt
2015-02-13 14:12:38 -08:00
Xuan 3c4b5606dc YARN-3164. RMAdmin command usage prints incorrect command name.
Contributed by Bibin A Chundatt

(cherry picked from commit 253035491c)
2015-02-12 21:40:42 -08:00
Tsuyoshi Ozawa 46ad4c9098 HADOOP-11497. Fix typo in ClusterSetup.html#Hadoop_Startup. Contributed by Christian Winkler. 2015-02-13 12:34:27 +09:00
Akira Ajisaka 4d0e792a82 HADOOP-9869. Configuration.getSocketAddr()/getEnum() should use getTrimmed(). Contributed by Tsuyoshi Ozawa.
(cherry picked from commit 9395c76697)
2015-02-12 15:52:27 -08:00
Akira Ajisaka 7d6c3c6dbe HADOOP-11586. Update use of Iterator to Iterable in AbstractMetricsContext.java. Contributed by Ray Chiang.
(cherry picked from commit 11d8934463)
2015-02-12 14:42:10 -08:00
Colin Patrick Mccabe e35788aa5a HDFS-7694. FSDataInputStream should support "unbuffer" (cmccabe)
(cherry picked from commit 6b39ad0865)
2015-02-12 10:42:14 -08:00
Haohui Mai 92f52e8962 HADOOP-11587. TestMapFile#testMainMethodMapFile creates test files in hadoop-common project root. Contributed by Xiaoyu Yao. 2015-02-12 10:31:04 -08:00
Jing Zhao 2156e38d5e HDFS-3689. Add support for variable length block. Contributed by Jing Zhao.
(cherry picked from commit 2848db814a)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirConcatOp.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileAppend3.java
2015-02-12 10:23:13 -08:00
Tsuyoshi Ozawa c9c1d9a5a6 HADOOP-11543. Improve help message for hadoop/yarn command. Contributed by Brahma Reddy Battula. 2015-02-12 19:03:24 +09:00
cnauroth c9266132ee HADOOP-10140. Specification of HADOOP_CONF_DIR via the environment in hadoop_config.cmd. Contributed by Kiran Kumar M R.
(cherry picked from commit 67efab935e)
2015-02-11 16:36:18 -08:00
Konstantin V Shvachko ada7791ef4 HADOOP-11579. Documentation for truncate. Contributed by Konstantin Shvachko. 2015-02-11 10:03:54 -08:00
Steve Loughran a8eaec396f YARN-2683. [YARN-913] registry config options: document and move to core-default. (stevel) 2015-02-11 14:26:22 +00:00
Colin Patrick Mccabe 5e7deba1f4 HADOOP-10953. NetworkTopology#add calls NetworkTopology#toString without holding the netlock (Liang Xie via Colin P. McCabe)
(cherry picked from commit 6338ce3ae8)
2015-02-10 13:30:49 -08:00
Harsh J 442bc776db HADOOP-11512. Use getTrimmedStrings when reading serialization keys. Contributed by Ryan P. 2015-02-10 12:52:41 +05:30
yliu ae316705bb HADOOP-11510. Expose truncate API via FileContext. (yliu) 2015-02-10 01:43:08 +08:00
Arpit Agarwal ff900eb64a HDFS-7647. DatanodeManager.sortLocatedBlocks sorts DatanodeInfos but not StorageIDs. (Contributed by Milan Desai) 2015-02-09 12:17:53 -08:00
Steve Loughran af7368cf03 HADOOP-11520. Clean incomplete multi-part uploads in S3A tests. (Thomas Demoor via stevel) 2015-02-06 20:59:56 +00:00
Steve Loughran d827f02bcd HADOOP-11535 TableMapping related tests failed due to 'successful' resolving of invalid test hostname 2015-02-06 13:03:30 +00:00
Gera Shegalov 3d36d4737c HADOOP-11506. Configuration variable expansion regex expensive for long values. (Gera Shegalov via gera)
(cherry picked from commit 644548f201)

Conflicts:
	hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
	hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java
2015-02-06 01:44:14 -08:00
yliu e2803f5a51 HDFS-7741. Remove unnecessary synchronized in FSDataInputStream and HdfsDataInputStream. (yliu) 2015-02-06 06:29:52 +08:00
Tsuyoshi Ozawa 995f9809c0 Revert "HADOOP-11543. Improve help message for hadoop/yarn command. Contributed by Brahma Reddy Battula."
This reverts commit 366a12c3b9.
2015-02-06 13:49:58 +09:00
Tsuyoshi Ozawa 366a12c3b9 HADOOP-11543. Improve help message for hadoop/yarn command. Contributed by Brahma Reddy Battula. 2015-02-06 13:34:48 +09:00
cnauroth a9ea7cff31 HADOOP-11526. Memory leak in Bzip2Compressor and Bzip2Decompressor. Contributed by Anu Engineer.
(cherry picked from commit 6583ad148b)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
2015-02-05 16:56:16 -08:00
yliu 3ffe5a1ed2 HDFS-7655. Expose truncate API for Web HDFS. (yliu) 2015-02-05 23:48:55 +08:00
Steve Loughran 4cd9657b71 HADOOP-11463 Replace method-local TransferManager object with S3AFileSystem#transfers. (Ted Yu via stevel) 2015-02-05 12:19:49 +00:00
Junping Du f59b698fc9 HADOOP-10062. race condition in MetricsSystemImpl#publishMetricsNow that causes incorrect results. (Contributed by Sangjin Lee)
(cherry picked from commit 0b567f4246)
2015-02-04 19:12:21 -08:00
Akira Ajisaka 17797c73c2 HADOOP-11549. flaky test detection tool failed to handle special control characters in test result. Contributed by Yongjun Zhang.
(cherry picked from commit 5f4ef2d13f)
2015-02-04 14:18:31 -08:00
Karthik Kambatla fcf3dc5977 HADOOP-11492. Bump up curator version to 2.7.1. (Arun Suresh and Karthik Kambatla via kasha)
(cherry picked from commit 55235d28c3)
2015-02-04 14:00:44 -08:00
cnauroth 196443318f HADOOP-11547. hadoop-common native compilation fails on Windows due to missing support for __attribute__ declaration. Contributed by Chris Nauroth.
(cherry picked from commit a35e86c670)
2015-02-04 12:07:13 -08:00
Andrew Wang 696266e99c HDFS-7734. Class cast exception in NameNode#main. Contributed by Yi Liu.
(cherry picked from commit 9175105eea)
2015-02-04 11:31:49 -08:00
cnauroth 85b2739508 HADOOP-11548. checknative should display a nicer error message when openssl support is not compiled in. Contributed by Anu Engineer.
(cherry picked from commit 064e0770a0)
2015-02-04 10:01:39 -08:00
Tsuyoshi Ozawa f92d4fa20f HADOOP-11546. Checkstyle failing: Unable to instantiate DoubleCheckedLockingCheck. (ozawa)
(cherry picked from commit ba58da29f4)
2015-02-05 00:51:40 +09:00
Akira Ajisaka 5c5139d35f HADOOP-11544. Remove unused configuration keys for tracing. Contributed by Masatake Iwasaki.
(cherry picked from commit 42548f4dc2)
2015-02-04 04:20:08 -08:00
Haohui Mai 6c5ae1571c HADOOP-11529. Fix findbugs warnings in hadoop-archives. Contributed by Masatake Iwasaki. 2015-02-03 10:53:26 -08:00
Robert Kanter 410830fe8c YARN-3022. Expose Container resource information from NodeManager for monitoring (adhoot via ranter)
(cherry picked from commit f7a77819a1)
2015-02-03 10:39:51 -08:00
Tsuyoshi Ozawa b396d2e8d8 HADOOP-11045. Introducing a tool to detect flaky tests of hadoop jenkins testing job. Contributed by Yongjun Zhang and Todd Lipcon.
(cherry picked from commit 80705e034b)
2015-02-04 01:26:44 +09:00
cnauroth dedfb982f1 HADOOP-11442. hadoop-azure: Create test jar. Contributed by Shashank Khandelwal.
(cherry picked from commit 1c09ca2ba4)
2015-02-02 11:51:01 -08:00
cnauroth aee297ccea HADOOP-10181. GangliaContext does not work with multicast ganglia setup. Contributed by Andrew Johnson.
(cherry picked from commit 8004a00230)

Conflicts:
	hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/ganglia/GangliaContext.java
2015-02-02 11:16:13 -08:00
Benoy Antony f3ed5b68ca HADOOP-11494. Lock acquisition on WrappedInputStream#unwrappedRpcBuffer may race with another thread. Contributed by Ted Yu.
(cherry picked from commit 3472e3bd6c)
2015-02-02 10:46:54 -08:00
Harsh J 648510e031 HADOOP-11488. Difference in default connection timeout for S3A FS. Contributed by Daisuke Kobayashi.
(cherry picked from commit ffc75d6ebe)
2015-02-01 00:17:24 +05:30
Gera Shegalov 151e147e64 HADOOP-11432. Fix SymlinkBaseTest#testCreateLinkUsingPartQualPath2. (Liang Xie via gera)
(cherry picked from commit 26c2de36e2)
2015-01-30 18:47:03 -08:00
Colin Patrick Mccabe 80381b62aa HADOOP-11498. Bump the version of HTrace to 3.1.0-incubating (Masatake Iwasaki via Colin P. McCabe)
(cherry picked from commit 09ad9a868a)
2015-01-30 16:02:36 -08:00
Kihwal Lee 3a01984bda HADOOP-9137. Support connection limiting in IPC server. Contributed by Kihwal Lee.
(cherry picked from commit 8dc59cb9e0)
2015-01-30 17:22:48 -06:00
cnauroth 4607ca2854 HADOOP-11523. StorageException complaining " no lease ID" when updating FolderLastModifiedTime in WASB. Contributed by Duo Xu.
(cherry picked from commit f2c91098c4)
2015-01-29 17:02:48 -08:00
Colin Patrick Mccabe e8d154baea HADOOP-11403. Avoid using sys_errlist on Solaris, which lacks support for it (Malcolm Kavalsky via Colin P. McCabe)
(cherry picked from commit e36ef3b402)
2015-01-29 15:48:59 -08:00
cnauroth fa2378d866 HADOOP-11441. Hadoop-azure: Change few methods scope to public. Contributed by Shashank Khandelwal.
(cherry picked from commit ad55083f75)
2015-01-29 13:07:59 -08:00
Akira Ajisaka 1081b4c4a7 HADOOP-9907. Webapp http://hostname:port/metrics link is not working. (aajisaka)
(cherry picked from commit 342efa110a)
2015-01-30 02:50:46 +09:00
Akira Ajisaka 7411c74b11 HADOOP-10574. Bump the maven plugin versions too -moving the numbers into properties. (aajisaka)
(cherry picked from commit 57b8950f37)

Conflicts:
	pom.xml
2015-01-30 02:27:36 +09:00
Akira Ajisaka 71c60af84e HADOOP-10525. Remove DRFA.MaxBackupIndex config from log4j.properties (aajisaka)
(cherry picked from commit 03a5e04d5b)
2015-01-29 16:18:07 +09:00
Tsuyoshi Ozawa 71db37266b HADOOP-11316. "mvn package -Pdist,docs -DskipTests -Dtar" fails because of non-ascii characters. (ozawa)
(cherry picked from commit 9850e1584b)
2015-01-28 22:01:38 +09:00
Tsuyoshi Ozawa 235a77fe1c HADOOP-11317. Increment SLF4J version to 1.7.10. Contributed by Tim Robertson.
(cherry picked from commit 20a4768397)
2015-01-28 21:55:33 +09:00
yliu 3ac8f88989 HADOOP-11469. KMS should skip default.key.acl and whitelist.key.acl when loading key acl. (Dian Fu via yliu) 2015-01-27 23:55:52 +08:00
Aaron T. Myers 3c8d3816c6 HADOOP-10626. Limit Returning Attributes for LDAP search. Contributed by Jason Hubbard.
(cherry picked from commit 8709751e1ee9a2c5553823dcd715bd077052ad7f)
2015-01-27 13:51:19 -08:00
Haohui Mai 3d6318b51b HADOOP-4297. Enable Java assertions when running tests. Contributed by Tsz Wo Nicholas Sze. 2015-01-27 11:06:15 -08:00
Xuan f93fa39384 HADOOP-11509. Change parsing sequence in GenericOptionsParser to parse
-D parameters before -files. Contributed by Xuan Gong

(cherry picked from commit 0bf333911c)
2015-01-26 15:37:14 -08:00
Steve Loughran 0ada35c912 HADOOP-6221 RPC Client operations cannot be interrupted (stevel) 2015-01-26 22:04:45 +00:00