Commit Graph

2347 Commits

Author SHA1 Message Date
Brahma Reddy Battula a5a5bcdb60 MAPREDUCE-6676. NNBench should Throw IOException when rename and delete fails. Contributed by Brahma Reddy Battula.
(cherry picked from commit 24181f559f)
2017-06-07 16:37:11 +08:00
Sunil G ec346d6377 YARN-6584. Correct license headers in hadoop-common, hdfs, yarn and mapreduce. Contributed by Yeliang Cang. 2017-05-23 07:57:36 +05:30
Jason Lowe 48b5faa705 MAPREDUCE-6882. Increase MapReduce test timeouts from 1 second to 10 seconds. Contributed by Eric Badger
(cherry picked from commit 1e71fe8c42)
2017-05-10 09:58:51 -05:00
Robert Kanter d686560b35 MAPREDUCE-6871. Allow users to specify racks and nodes for strict locality for AMs (rkanter)
(cherry picked from commit 3721cfe1fb)
2017-04-21 16:12:45 -07:00
Haibo Chen d4f553d42f MAPREDUCE-6673. Add a test example job that grows in memory usage over time (Karthik Kambatla via Haibo Chen)
Change-Id: Iccfc8c67c38c526cc61726d87bfcbcf69ac36fea
(cherry picked from commit 25ac44709b4bbed78b607ea48021237b64e01b9f)
2017-04-14 17:37:37 -07:00
Daniel Templeton 2f32accaaf MAPREDUCE-6846. Fragments specified for libjar paths are not handled correctly
(Contributed by Chris Trezzo via Daniel Templeton)

(cherry picked from commit a92bc8a6c1c50d34d8229a67dc9d197823001551)
2017-04-05 17:26:06 -07:00
Akira Ajisaka 438901f6c8
MAPREDUCE-6824. TaskAttemptImpl#createCommonContainerLaunchContext is longer than 150 lines. Contributed by Chris Trezzo. 2017-04-05 16:45:38 +09:00
Jason Lowe 3ae529ba54 YARN-6411. Clean up the overwrite of createDispatcher() in subclass of MockRM. Contributed by Yufei Gu
(cherry picked from commit 4d1fac5df2)

Conflicts:
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClientOnRMRestart.java
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestClientToAMTokens.java
2017-03-31 10:21:44 -05:00
Jason Lowe a52b30f7e8 MAPREDUCE-6836. exception thrown when accessing the job configuration web UI. Contributed by Haibo Chen
(cherry picked from commit c9b7ce9273)
2017-03-30 12:56:04 -05:00
Jason Lowe 526499533e MAPREDUCE-6850. Shuffle Handler keep-alive connections are closed from the server side. Contributed by Jonathan Eagles
(cherry picked from commit c8bd5fc7a8)

Conflicts:
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java
2017-03-30 11:10:20 -05:00
Zhe Zhang 3f5dc51ec9 MAPREDUCE-6873. MR Job Submission Fails if MR framework application path not on defaultFS. Contributed by Erik Krogen.
(cherry picked from commit de7efd2687)
2017-03-29 22:11:22 -07:00
Ming Ma 2ae9ae1864 MAPREDUCE-6862. Fragments are not handled correctly by resource limit checking. (Chris Trezzo via mingma)
(cherry picked from commit ceab00ac62)
2017-03-29 17:42:40 -07:00
Robert Kanter a65011a128 YARN-6050. AMs can't be scheduled on racks or nodes (rkanter) 2017-03-28 14:33:08 -07:00
Junping Du 0e8beb214d MAPREDUCE-6868. License check for jdiff output files should be ignored. Contributed by Akira Ajisaka.
(cherry picked from commit 945b006fe8)
2017-03-26 23:19:05 -07:00
Joe Mészáros 34a11b9108
MAPREDUCE-6866. Fix getNumMapTasks() documentation in JobConf.
This closes #205

Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
(cherry picked from commit e0a2eb71e3)
2017-03-27 13:52:26 +09:00
Junping Du 3ad4d37363 Add COMMON/MAPREDUCE/YARN jdiff of 2.8.0 release.
(cherry picked from commit 6df029db36)
2017-03-25 14:33:20 -07:00
Naganarasimha 0cfa6ec6c8 MAPREDUCE-6865. Fix typo in javadoc for DistributedCache. Contributed by Attila Sasvari.
(cherry picked from commit 34a931c0fa)
2017-03-20 08:26:05 +05:30
Robert Kanter 7953ac4da6 MAPREDUCE-6839. TestRecovery.testCrashed failed (pairg via rkanter)
(cherry picked from commit 38d75dfd3a)
2017-03-07 13:39:40 -08:00
Akira Ajisaka 120f680318
Treat encrypted files as private. Contributed by Daniel Templeton.
(cherry picked from commit f01a69f84f)
2017-03-07 13:38:20 +09:00
Akira Ajisaka aa1f944bba
MAPREDUCE-6855. Specify charset when create String in CredentialsTestJob. Contributed by Kai Sasaki.
(cherry picked from commit 14413989ca)
2017-03-07 13:12:58 +09:00
Akira Ajisaka ed55bcee1f
HADOOP-14108. CLI MiniCluster: add an option to specify NameNode HTTP port. Contributed by Takanobu Asanuma.
(cherry picked from commit 209ecd1a5c)
2017-03-07 01:36:10 +09:00
Akira Ajisaka e2fb9538f0 MAPREDUCE-6753. Variable in byte printed directly in mapreduce client. Contributed by Kai Sasaki.
(cherry picked from commit 19a1fc6373)
2017-03-03 16:13:26 +09:00
Akira Ajisaka e563cd8692 MAPREDUCE-6841. Fix dead link in MapReduce tutorial document. Contributed by Victor Nee.
(cherry picked from commit 4d33683882)
2017-03-03 16:12:56 +09:00
Jian He b8b605bfc5 MAPREDUCE-6852. Job#updateStatus() failed with NPE due to race condition. Contributed by Junping Du 2017-03-02 10:59:18 -08:00
Wangda Tan 650ff95e00 YARN-5959. RM changes to support change of container ExecutionType. (Arun Suresh via wangda)
(cherry picked from commit 0a55bd841e)
2017-02-23 17:22:25 -08:00
Wangda Tan a82480c7d4 YARN-6143. Fix incompatible issue caused by YARN-3583. (Sunil G via wangda) 2017-02-23 13:59:20 -08:00
Daniel Templeton 4c883f331c MAPREDUCE-6825. YARNRunner#createApplicationSubmissionContext method is longer than 150 lines (Contributed by Gergely Novák via Daniel Templeton)
(cherry picked from commit 732ee6f0b5)
2017-02-22 15:40:12 -08:00
Daniel Templeton 85261cbe0e MAPREDUCE-6842. Update the links in PiEstimator document (Contributed by Jung Yoo via Daniel Templeton)
(cherry picked from commit 0e58b368f001b3bb4031b923b63dce7c81d42d39)
2017-02-07 13:06:50 -08:00
Junping Du 81e2d54ac6 MAPREDUCE-6404. Allow AM to specify a port range for starting its webapp. Contributed by Varun Saxena.
(cherry picked from commit 7afe5b1a31)
2017-02-07 01:46:17 -08:00
Junping Du 378d62663f MAPREDUCE-6338. MR AppMaster does not honor ephemeral port range. Contributed by Frank Nguyen.
(cherry picked from commit d401e63b6c)
2017-02-05 19:28:53 -08:00
Masatake Iwasaki 2f4cf07fb1 MAPREDUCE-6644. Use doxia macro to generate in-page TOC of MapReduce site documentation. (iwasakims)
(cherry picked from commit 3619ae32be)
2017-02-02 01:23:02 +09:00
Karthik Kambatla a91cc63d37 MAPREDUCE-6829. Add peak memory usage counter for each task. (Miklos Szegedi via kasha)
(cherry picked from commit c65f884fc7)
2017-01-26 11:08:53 -08:00
Jason Lowe 94b326f2c8 YARN-5910. Support for multi-cluster delegation tokens. Contributed by Jian He
(cherry picked from commit 69fa81679f)

Conflicts:

	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java
2017-01-23 17:23:32 +00:00
Jason Lowe bec7c56ce5 MAPREDUCE-6831. Flaky test TestJobImpl.testKilledDuringKillAbort. Contributed by Peter Bacsko
(cherry picked from commit 78b487bde1)
2017-01-17 16:03:20 +00:00
Arun Suresh 4985217de4 YARN-6066. Opportunistic containers Minor fixes : API annotations, parameter name changes, checkstyles. (asuresh) 2017-01-08 08:27:10 -08:00
Junping Du bf87c523ab MAPREDUCE-6711. JobImpl fails to handle preemption events on state COMMITTING. Contributed by Prabhu Joseph.
(cherry picked from commit 679478d0c6)
2017-01-07 22:05:16 -08:00
Arun Suresh 2b4d3e8506 YARN-5646. Add documentation and update config parameter names for scheduling of OPPORTUNISTIC containers. (Konstantinos Karanasos via asuresh)
(cherry picked from commit 2273a74c1f)
(cherry picked from commit 9e17ffe599e12c59c48f4355de645c31a4735d04)
2017-01-06 11:15:10 -08:00
Arun Suresh 368565f0ce YARN-4597. Introduce ContainerScheduler and a SCHEDULED state to NodeManager container lifecycle. (asuresh)
(cherry picked from commit 3219b7b4ac)
(cherry picked from commit 49921678858a17ca58ca2ae704ced1ff584e0859)
2017-01-06 11:15:09 -08:00
Arun Suresh 7437252102 YARN-2995. Enhance UI to show cluster resource utilization of various container Execution types. (Konstantinos Karanasos via asuresh)
(cherry picked from commit 0aafc122d4)
(cherry picked from commit 25598b6e7118bacd33a167fb496e9cda5e9f9ad0)
2017-01-06 11:15:09 -08:00
Jason Lowe 937f739804 MAPREDUCE-6682. TestMRCJCFileOutputCommitter fails intermittently Contributed by Akira Ajisaka.
(cherry picked from commit 8f1c374bec)

Conflicts:

	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMRTimelineEventHandling.java
2017-01-06 18:46:28 +00:00
Daniel Templeton d1aa844dc6 MAPREDUCE-6715. Fix Several Unsafe Practices (Contributed by Yufei Gu via Daniel Templeton)
(cherry picked from commit 0b8a7c18dd)
2017-01-05 17:57:14 -08:00
Akira Ajisaka 3e2d26a97f HADOOP-12733. Remove references to obsolete io.seqfile configuration variables. Contributed by Ray Chiang.
(cherry picked from commit 01d31fe938)
2017-01-04 14:15:00 +09:00
Brahma Reddy Battula d6e5e4288c HADOOP-13883. Addendum patch to correct the message and alphabetized with the earlier patch. Contributed by Yiqun Lin.
(cherry picked from commit 6938b67711)
2016-12-31 16:17:15 +05:30
Daniel Templeton 28b605dd1a HADOOP-13940. Document the missing envvars commands (Contributed by Yiqun Lin via Daniel Templeton)
(cherry picked from commit d432173737a532b7106682116013b751ba162ff0)
2016-12-27 07:19:37 -08:00
Akira Ajisaka 522bc98026 YARN-4994. Use MiniYARNCluster with try-with-resources in tests. Contributed by Andras Bokor.
(cherry picked from commit ae401539ea)
2016-12-23 04:06:53 +09:00
Ravi Prakash d7d9006afc HADOOP-13898. Should set HADOOP_JOB_HISTORYSERVER_HEAPSIZE only if it's empty. Contributed by Fei Hui. 2016-12-13 13:08:54 -08:00
Akira Ajisaka 1e1ab9bc1b MAPREDUCE-6820. Fix dead links in Job relevant classes. Contributed by Yiqun Lin.
(cherry picked from commit 92a8917ca5)
2016-12-10 10:57:06 +09:00
Karthik Kambatla 0aaaeea268 MAPREDUCE-6817. The format of job start time in JHS is different from those of submit and finish time. (Haibo Chen via kasha)
(cherry picked from commit a793cec2c9)
2016-12-07 13:37:12 -08:00
Akira Ajisaka 03854f0bc5 MAPREDUCE-6816. Progress bars in Web UI always at 100%. Contributed by Shen Yinjie.
(cherry picked from commit da4ecc9f82)
2016-12-07 06:44:03 +09:00
Robert Kanter 1585b4f7ce MAPREDUCE-6571. JobEndNotification info logs are missing in AM container syslog (haibochen via rkanter)
(cherry picked from commit 6b4a9970f1)
2016-12-06 13:11:20 -08:00
Jason Lowe e8cd9dc200 MAPREDUCE-6815. Fix flaky TestKill.testKillTask(). Contributed by Haibo Chen
(cherry picked from commit 0cfd7ad21f)
2016-12-02 17:23:10 +00:00
Robert Kanter 99b046f8a9 MAPREDUCE-6787. Allow job_conf.xml to be downloadable on the job overview page in JHS (haibochen via rkanter)
(cherry picked from commit c87b3a448a)
2016-12-01 17:30:02 -08:00
Junping Du 376a2439db MAPREDUCE-6565. Configuration to use host name in delegation token service is not read from job.xml during MapReduce job execution. Contributed by Li Lu.
(cherry picked from commit 8f6e14399a)
2016-11-29 16:50:17 -08:00
Rohith Sharma K S 4b289d567e MAPREDUCE-6793. io.sort.factor code default and mapred-default.xml values inconsistent. Contributed by Gera Shegalov.
(cherry picked from commit 683e0c71fe)
2016-11-21 22:11:59 +05:30
Varun Saxena ca3b40306b MAPREDUCE-6801. Fix flaky TestKill.testKillJob (Haibo Chen via Varun Saxena)
(cherry picked from commit 7584fbf4cb)
2016-11-19 01:39:47 +05:30
Varun Saxena bcfa6d5384 MAPREDUCE-6811. TestPipeApplication#testSubmitter fails after HADOOP-13802 (Brahma Reddy Battula via Varun Saxena)
(cherry picked from commit b8690a9d25)
2016-11-17 00:55:12 +05:30
Jason Lowe 41f8275c50 MAPREDUCE-6804. Add timeout when starting JobHistoryServer in MiniMRYarnCluster. Contributed by Andras Bokor 2016-11-16 15:26:19 +00:00
Mingliang Liu 4e0fcff8ab HADOOP-13427. Eliminate needless uses of FileSystem#{exists(), isFile(), isDirectory()}. Contributed by Steve Loughran and Mingliang Liu
(cherry picked from commit 5af572b644)
2016-11-15 11:36:08 -08:00
Jason Lowe 5ffb26c2a9 MAPREDUCE-6797. Job history server scans can become blocked on a single, slow entry. Contributed by Prabhu Joseph
(cherry picked from commit 99c2bbd337)
2016-11-14 20:30:36 +00:00
Jian He a422740bd7 YARN-5611. Provide an API to update lifetime of an application. Contributed by Rohith Sharma K S 2016-11-09 16:39:46 -08:00
Andrew Wang 4f25fd975e HADOOP-13789. Hadoop Common includes generated test protos in both jar and test-jar. Contributed by Sean Busbey.
(cherry picked from commit e1c6ef2efa)
2016-11-08 16:33:58 -08:00
Varun Saxena a942d968c9 MAPREDUCE-6782. JHS task page search based on each individual column not working (Ajith S via Varun Saxena)
(cherry picked from commit 026b39ad9d)
2016-11-08 15:02:46 +05:30
Robert Kanter 568b5eecd8 MAPREDUCE-6765. MR should not schedule container requests in cases where reducer or mapper containers demand resource larger than the maximum supported (haibochen via rkanter)
(cherry picked from commit fc2b69eba1)
2016-11-01 20:47:58 -07:00
Akira Ajisaka a3897f77ae MAPREDUCE-6795. Update the document for JobConf#setNumReduceTasks. Contributed by Yiqun Lin.
(cherry picked from commit 235f39b7c4)
2016-11-01 20:52:35 +09:00
Akira Ajisaka ef13a5ef9d MAPREDUCE-6799. Document mapreduce.jobhistory.webapp.https.address in mapred-default.xml. Contributed by Yiqun Lin.
(cherry picked from commit f646fe34be)
2016-10-31 15:18:34 +09:00
Naganarasimha 1455f56b63 MAPREDUCE-2631. Potential resource leaks in BinaryProtocol$TeeOutputStream.java. Contributed by Sunil G.
(cherry picked from commit 28660f51af)
2016-10-28 06:00:29 +05:30
Varun Saxena f572448809 YARN-4388. Cleanup mapreduce.job.hdfs-servers from yarn-default.xml (Junping Du via Varun Saxena) 2016-10-28 02:24:24 +05:30
Naganarasimha fe5c1f249a MAPREDUCE-6541. Exclude scheduled reducer memory when calculating available mapper slots from headroom to avoid deadlock. Contributed by Varun Saxena
(cherry picked from commit 060558c6f2)
2016-10-27 18:05:00 +05:30
Varun Saxena 65fa9827fc YARN-5757. RM REST API documentation is not up to date (Miklos Szegedi via Varun Saxena) 2016-10-27 17:24:24 +05:30
Varun Saxena 14ce42a8ed MAPREDUCE-6798. Fix intermittent failure of TestJobHistoryParsing.testJobHistoryMethods (Haibo Chen via Varun Saxena) 2016-10-27 15:41:27 +05:30
Akira Ajisaka e29d0a2fd8 YARN-5575. Many classes use bare yarn. properties instead of the defined constants. Contributed by Daniel Templeton.
(cherry picked from commit d3bb69a667)
2016-10-26 15:34:40 +09:00
Junping Du 432657780d MAPREDUCE-6792. Allow user's full principal name as owner of MapReduce staging directory in JobSubmissionFiles#JobStagingDir(). Contributed by Santhosh G Nayak.
(cherry picked from commit 9b7ce948a5)
2016-10-25 11:21:33 -07:00
Robert Kanter c76eb90f0e MAPREDUCE-6728. Give fetchers hint when ShuffleHandler rejects a shuffling connection (haibochen via rkanter) 2016-10-24 17:47:09 -07:00
Robert Kanter 48ca6be76e MAPREDUCE-6776. yarn.app.mapreduce.client.job.max-retries should have a more useful default (miklos.szegedi@cloudera.com via rkanter)
(cherry picked from commit f3f37e6fb8)
2016-10-07 14:47:23 -07:00
Akira Ajisaka 5f1432d98e MAPREDUCE-6789. Fix TestAMWebApp failure. Contributed by Daniel Templeton.
(cherry picked from commit 272a21747e)
2016-10-06 15:59:19 +09:00
Karthik Kambatla 876fc2e61a MAPREDUCE-6638. Do not attempt to recover progress from previous job attempts if spill encryption is enabled. (Haibo Chen via kasha)
(cherry picked from commit de7a0a92ca)
2016-10-03 10:30:44 -07:00
Jason Lowe c52ad9ee86 MAPREDUCE-6771. RMContainerAllocator sends container diagnostics event after corresponding completion event. Contributed by Haibo Chen 2016-09-29 15:50:50 +00:00
Robert Kanter 85724268c2 MAPREDUCE-6718. add progress log to JHS during startup (haibochen via rkanter)
(cherry picked from commit 0d6778d800)
2016-09-28 16:04:48 -07:00
Wangda Tan 269401dc83 HADOOP-13544. JDiff reports unncessarily show unannotated APIs and cause confusion while our javadocs only show annotated and public APIs. (vinodkv via wangda)
(cherry picked from commit 875062b5bc)
2016-09-27 11:27:25 -07:00
Arun Suresh 7484d0b1b9 YARN-5609. Expose upgrade and restart API in ContainerManagementProtocol. Contributed by Arun Suresh 2016-09-26 23:55:13 +08:00
Naganarasimha 0e4a5611ff YARN-3692. Allow REST API to set a user generated message when killing an application. Contributed by Rohith Sharma K S 2016-09-24 21:13:01 +05:30
Robert Kanter 254041b71a MAPREDUCE-6632. Master.getMasterAddress() should be updated to use YARN-4629 (templedf via rkanter)
(cherry picked from commit 4fc632ae19)
2016-09-22 16:13:24 -07:00
Karthik Kambatla a0b0767856 MAPREDUCE-6740. Enforce mapreduce.task.timeout to be at least mapreduce.task.progress-report.interval. (Haibo Chen via kasha)
(cherry picked from commit 537095d13c)
2016-09-21 18:30:42 -07:00
Naganarasimha fa80972efb MAPREDUCE-6777. Typos in 4 log messages. Contributed by Mehran Hassani 2016-09-17 10:21:13 +05:30
Chris Douglas 806a8dea38 MAPREDUCE-6628. Potential memory leak in CryptoOutputStream. Contributed by Mariappan Asokan
(cherry picked from commit 9f192cc5ac)
2016-09-09 11:14:30 -07:00
Arun Suresh b279f42d79 YARN-5221. Expose UpdateResourceRequest API to allow AM to request for change in container properties. (asuresh)
(cherry picked from commit d6d9cff21b)
2016-08-30 16:33:31 -07:00
Jason Lowe f70f522e80 MAPREDUCE-4784. TestRecovery occasionally fails. Contributed by Haibo Chen
(cherry picked from commit af508605a9)

Conflicts:

	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRecovery.java
2016-08-30 14:09:14 +00:00
Jason Lowe 44d0af2611 MAPREDUCE-6768. TestRecovery.testSpeculative failed with NPE. Contributed by Haibo Chen 2016-08-29 19:57:38 +00:00
Junping Du af1502fcab YARN-5557. Add localize API to the ContainerManagementProtocol. Contributed by Jian He.
(cherry picked from commit 9ef632f3b0)
2016-08-26 09:05:33 -07:00
Wei-Chiu Chuang 13cbf1677e MAPREDUCE-6764. Teragen LOG initialization bug. Contributed by Yufei Gu.
(cherry picked from commit 1360bd2d54)
2016-08-25 09:51:17 -07:00
Jason Lowe 5cdc4ba9f4 MAPREDUCE-6761. Regression when handling providers - invalid configuration ServiceConfiguration causes Cluster initialization failure. Contributed by Peter Vary
(cherry picked from commit 6fa9bf4407)
2016-08-24 14:42:06 +00:00
Naganarasimha 5fa241daa0 YARN-4491. yarn list command to support filtering by tags. Contributed by Varun Saxena
(cherry picked from commit 143c59e4c5)
2016-08-24 01:55:24 +05:30
Akira Ajisaka 41fe85f868 MAPREDUCE-6587. Remove unused params in connection-related methods of Fetcher. Contributed by Yiqun Lin.
(cherry picked from commit 8cc4a67059)
2016-08-23 17:05:45 +09:00
Varun Saxena 4ba8dbf00e MAPREDUCE-6762. ControlledJob#toString failed with NPE when job status is not successfully updated (Weiwei Yang via Varun Saxena) 2016-08-21 21:50:44 +05:30
Wangda Tan 65822e55fd MAPREDUCE-6310. Add jdiff support to MapReduce. (Li Lu/vinodkv via wangda)
(cherry picked from commit 3d937457ee)
2016-08-19 16:41:47 -07:00
Varun Saxena 5128e3320e MAPREDUCE-6763. Shuffle server listen queue is too small (Jason Lowe via Varun Saxena) 2016-08-20 04:05:01 +05:30
Jason Lowe 848ae35a93 MAPREDUCE-6690. Limit the number of resources a single map reduce job can submit for localization. Contributed by Chris Trezzo
(cherry picked from commit f80a729832)
2016-08-17 16:24:16 +00:00
Ray Chiang d1c4ba2d7c MAPREDUCE-6751. Add debug log message when splitting is not possible due to unsplittable compression. (Peter Vary via rchiang)
(cherry picked from commit 6c154abd33)
2016-08-16 12:14:30 -07:00
Varun Saxena 705307eda3 MAPREDUCE-6750. Fix TestHSAdminServer#testRefreshSuperUserGroups (Kihwal Lee via Varun Saxena) 2016-08-09 23:43:27 +05:30
Jason Lowe f18febd933 MAPREDUCE-6741. Add MR support to redact job conf properties. Contributed by Haibo Chen
(cherry picked from commit 4aba858750)

Conflicts:

	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestJobHistoryEventHandler.java
2016-08-09 16:32:38 +00:00