Commit Graph

2573 Commits

Author SHA1 Message Date
Eric Payne a552932b38 YARN-5069. TestFifoScheduler.testResourceOverCommit race condition. Contributed by Eric Badger.
(cherry picked from commit 1217c8f6b4)
2016-05-16 20:44:41 +00:00
Jason Lowe 70faa87ccf YARN-4325. Nodemanager log handlers fail to send finished/failed events in some cases. Contributed by Junping Du
(cherry picked from commit 81effb7dcd)
2016-05-16 15:43:42 +00:00
Xuan 4eeec4e35b YARN-5080. Cannot obtain logs using YARN CLI -am for either KILLED or
RUNNING AM. Contributed by Xuan Gong

(cherry picked from commit 7be53b65f9)
(cherry picked from commit 3fe4107909)
2016-05-14 12:22:33 -07:00
Karthik Kambatla a9b0041abc YARN-4995. FairScheduler: Display per-queue demand on the scheduler page. (xupeng via kasha)
(cherry picked from commit 4b4e4c6ba8)
(cherry picked from commit f96b2b6fac)
2016-05-11 17:40:57 -07:00
Junping Du 6d1300880f YARN-5029. RM needs to send update event with YarnApplicationState as Running to ATS/AHS. Contributed by Xuan Gong.
(cherry picked from commit 39f2bac38b)
(cherry picked from commit 9dc3683d87)
2016-05-11 09:40:51 -07:00
Naganarasimha b47259caf0 YARN-4926. Change nodelabel rest API invalid reponse status to 400. Contributed by Bibin A Chundatt
(cherry picked from commit 2750fb900f)
2016-05-08 23:06:15 +05:30
Yongjun Zhang 5ae5b869aa YARN-5048. DelegationTokenRenewer#skipTokenRenewal may throw NPE (Jian He via Yongjun Zhang)
(cherry picked from commit 47c41e7ac7)
2016-05-06 22:43:44 -07:00
Jason Lowe da24fe95f8 YARN-4747. AHS error 500 due to NPE when container start event is missing. Contributed by Varun Saxena
(cherry picked from commit b2ed6ae731)
2016-05-06 23:00:53 +00:00
Karthik Kambatla 367e757d8d YARN-4947. Test timeout is happening for TestRMWebServicesNodes. Contributed by Bibin A Chundatt 2016-05-06 14:28:24 +05:30
Wangda Tan 3620d0e623 YARN-4984. LogAggregationService shouldn't swallow exception in handling createAppDir() which cause thread leak. (Junping Du via wangda)
(cherry picked from commit 7bd418e48c)
2016-05-05 10:08:37 -07:00
Jason Lowe b452ecf4a0 YARN-4311. Removing nodes from include and exclude lists will not remove them from decommissioned nodes list. Contributed by Kuhu Shukla
(cherry picked from commit ee86cef2fe)

Conflicts:

	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
2016-05-05 14:40:35 +00:00
Junping Du 22ac37615a YARN-4920. ATS/NM should support a link to dowload/get the logs in text format. Contributed by Xuan Gong.
(cherry picked from commit 3cf223166d452a0f58f92676837a9edb8ddc1139)
(cherry picked from commit c79dc07dc193904f2586a5d64ea2f4e56d2396b8)
2016-05-04 09:49:08 -07:00
Jason Lowe 8013529746 YARN-4834. ProcfsBasedProcessTree doesn't track daemonized processes. Contributed by Nathan Roberts
(cherry picked from commit c6b4839168)
2016-05-03 22:15:31 +00:00
Junping Du 4f1c198881 YARN-4851. Metric improvements for ATS v1.5 storage components. Li Lu via junping_du.
(cherry picked from commit 06413da72e)
(cherry picked from commit 47f67ae447)
2016-05-03 04:59:57 -07:00
rohithsharmaks 9ea567da42 YARN-4109. Exception on RM scheduler page loading with labels. (Mohammad Shahid Khan via rohithsharmaks)
(cherry picked from commit 8c180a13c8)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
2016-05-03 10:31:32 +05:30
Robert Kanter 3c3d003402 Remove parent's env vars from child processes
(cherry picked from commit ac8fb579c6)
2016-04-29 15:30:06 -07:00
Jian He 5ba79d77fb YARN-5009. NMLeveldbStateStoreService database can grow substantially leading to longer recovery times. Contributed by Jason Lowe
(cherry picked from commit 4a8508501b)
2016-04-28 21:54:53 -07:00
Jian He e62162db46 YARN-5008. LeveldbRMStateStore database can grow substantially leading to long recovery times. Contributed by Jason Lowe
(cherry picked from commit dd80042c42)
2016-04-28 21:36:23 -07:00
Li Lu 76b4ec32e6 YARN-4956. findbug issue on LevelDBCacheTimelineStore. (Zhiyuan Yang via gtcarrera9)
(cherry picked from commit f16722d2ef)
2016-04-27 10:58:50 -07:00
Wangda Tan 358b54d063 YARN-3215. Respect labels in CapacityScheduler when computing headroom. (Naganarasimha G R via wangda) 2016-04-22 15:59:49 -07:00
Eric Payne b726ae0876 YARN-4556. TestFifoScheduler.testResourceOverCommit fails. Contributed by Akihiro Suda
(cherry picked from commit 3dce486d88)
2016-04-21 22:01:07 +00:00
Vinod Kumar Vavilapalli 92e45b8321 Fixed TimelineClient to retry SocketTimeoutException too. Contributed by Xuan Gong.
(cherry picked from commit 477003730e)
2016-04-18 11:51:21 -07:00
Xuan 84ab382939 YARN-4965. Distributed shell AM failed due to ClientHandlerException thrown by jersey. Contributed by Junping Du
(cherry picked from commit e6c0742012)
(cherry picked from commit 94e4d349b0)
2016-04-16 19:40:46 -07:00
Arun Suresh aa457912ca YARN-4468. Document the general ReservationSystem functionality, and the REST API. (subru and carlo via asuresh)
(cherry picked from commit 8460a323ce)
2016-04-15 17:24:44 -07:00
Jason Lowe d389afb3da YARN-4940. yarn node -list -all failed if RM start with decommissioned node. Contributed by sandflee
(cherry picked from commit 69f3d428d5)

Conflicts:

	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java
2016-04-15 20:45:20 +00:00
Naganarasimha 3e223d5dc0 YARN-4909. Fix intermittent failures of TestRMWebServices And TestRMWithCSRFFilter. Contributed by Bibin A Chundatt
(cherry picked from commit fdbafbc9e5)
2016-04-16 00:00:03 +05:30
Jason Lowe 9b5c5bd42f YARN-4924. NM recovery race can lead to container not cleaned up. Contributed by sandflee
(cherry picked from commit 3150ae8108)

Conflicts:

	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/recovery/NMLeveldbStateStoreService.java
2016-04-14 19:40:10 +00:00
Xuan 3127b86492 YARN-4886. Add HDFS caller context for EntityGroupFSTimelineStore. Contributed by Li Lu
(cherry picked from commit e0cb426758)
(cherry picked from commit 5bc64dafc3)
2016-04-13 10:40:04 -07:00
Junping Du c85a63aba1 YARN-4928. Some yarn.server.timeline.* tests fail on Windows attempting to use a test root path containing a colon. Contributed by Gergely Novák.
(cherry picked from commit 08ddb3ac6d)
(cherry picked from commit a3f8491410)
2016-04-13 09:05:09 -07:00
Rohith Sharma K S 9d4dedd65f YARN-4794. Deadlock in NMClientImpl. Contributed by Jian He.
(cherry picked from commit ff722bbbdf)
2016-04-12 10:05:35 +05:30
Vinod Kumar Vavilapalli 3589b9e10e YARN-4168. Fixed a failing test TestLogAggregationService.testLocalFileDeletionOnDiskFull. Contributed by Takashi Ohnishi.
(cherry picked from commit 44bbc50d91)
2016-04-11 12:13:37 -07:00
Jason Lowe 3cf7856878 Revert "YARN-4311. Removing nodes from include and exclude lists will not remove them from decommissioned nodes list. Contributed by Kuhu Shukla"
This reverts commit 9d3c51eb5a.
2016-04-11 15:57:56 +00:00
Akira Ajisaka 13be7a849d YARN-4630. Remove useless boxing/unboxing code. Contributed by Kousuke Saruta.
(cherry picked from commit 1ff27f9d12)
(cherry picked from commit 8cf6630fc6)
2016-04-11 14:55:54 +09:00
Akira Ajisaka 35fd4d4124 YARN-4938. MiniYarnCluster should not request transitionToActive to RM on non-HA environment. Contributed by Eric Badger.
(cherry picked from commit 1b78b2ba17)
(cherry picked from commit 88556294e2)
2016-04-11 01:33:02 +09:00
Wangda Tan 67ee302723 YARN-4826. Document configuration of ReservationSystem for CapacityScheduler. (Subru Krishnan via wangda)
(cherry picked from commit fcb3fcd4c6)

Conflicts:
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/CapacityScheduler.md

(cherry picked from commit dac2021f87)

Conflicts:
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/CapacityScheduler.md
2016-04-08 16:33:55 -07:00
Jian He 4cf0b1932f YARN-4740. AM may not receive the container complete msg when it restarts. Contributed by Jun Gong 2016-04-08 11:21:34 -07:00
Karthik Kambatla ddb1407980 YARN-4756. Unnecessary wait in Node Status Updater during reboot. (Eric Badger via kasha)
(cherry picked from commit e82f961a39)
(cherry picked from commit 2b97a50eec)
2016-04-07 17:35:06 -07:00
Wangda Tan b7c83d4883 YARN-4699. Scheduler UI and REST o/p is not in sync when -replaceLabelsOnNode is used to change label of a node. (Sunil G via wangda)
(cherry picked from commit 21eb428448)
2016-04-05 16:30:56 -07:00
Masatake Iwasaki deef54b261 YARN-4917. Fix typos in documentation of Capacity Scheduler. (Takashi Ohnishi via iwasakims)
(cherry picked from commit 500e5a5952)
2016-04-06 04:01:48 +09:00
Masatake Iwasaki 90adda5da5 YARN-4915. Fix typo in YARN Secure Containers documentation (Takashi Ohnishi via iwasakims)
(cherry picked from commit 30206346cf)
2016-04-06 03:47:53 +09:00
Junping Du 3df56a97df Small addendum to YARN-4893 to fix build failure. 2016-04-05 08:41:48 -07:00
Junping Du 9c2dc1a194 YARN-4893. Fix some intermittent test failures in TestRMAdminService. Contributed by Brahma Reddy Battula.
(cherry picked from commit 6be28bcc46)
(cherry picked from commit eeff2e35f8)
2016-04-05 08:41:48 -07:00
Jason Lowe 9d3c51eb5a YARN-4311. Removing nodes from include and exclude lists will not remove them from decommissioned nodes list. Contributed by Kuhu Shukla
(cherry picked from commit 1cbcd4a491)

Conflicts:

	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
2016-04-05 13:47:05 +00:00
Li Lu 3574b4559c YARN-4706. UI Hosting Configuration in TimelineServer doc is broken. (Akira AJISAKA via gtcarrera9)
(cherry picked from commit f61de41736)
2016-04-04 14:43:37 -07:00
naganarasimha 9bd089ac64 YARN-4746. yarn web services should convert parse failures of appId, appAttemptId and containerId to 400. Contributed by Bibin A Chundatt
(cherry picked from commit 5092c94195)
2016-04-04 18:16:23 +05:30
Allen Wittenauer 608223b51b YARN-4850. test-fair-scheduler.xml isn't valid xml (Yufei Gu via aw)
(cherry picked from commit b1394d6307)
(cherry picked from commit 92a3dbe44f)
2016-04-01 16:58:00 -07:00
Arun Suresh 82d1f858ee Missing file for YARN-4895.
(cherry picked from commit 5686caa9fc)
2016-04-01 15:58:54 -07:00
Arun Suresh 9def4d4d39 YARN-4895. Add subtractFrom method to ResourceUtilization class. Contributed by Konstantinos Karanasos.
(cherry picked from commit 82621e38a0)
2016-04-01 15:00:30 -07:00
Wangda Tan 6d454a5d6e YARN-4634. Scheduler UI/Metrics need to consider cases like non-queue label mappings. (Sunil G via wangda)
(cherry picked from commit 12b11e2e68)
2016-03-31 14:36:34 -07:00
Sangjin Lee 5e94e539e0 YARN-4183. Clarify the behavior of timeline service config properties (Naganarasimha G R via sjlee)
(cherry picked from commit 6d67420dbc)
2016-03-31 10:50:18 -07:00
Xuan d5ea2462c2 YARN-4863. AHS Security login should be in serviceInit() instead of serviceStart(). Contributed by Junping Du
(cherry picked from commit 80182809ae)
(cherry picked from commit ffe01e05cd)
2016-03-28 22:21:31 -07:00
Jason Lowe 35f9cfda61 YARN-4773. Log aggregation performs extraneous filesystem operations when rolling log aggregation is disabled. Contributed by Jun Gong
(cherry picked from commit 948b758070)
2016-03-28 23:03:16 +00:00
Jian He 7c81e374da YARN-4117. End to end unit test with mini YARN cluster for AMRMProxy Service. Contributed by Giovanni Matteo Fumarola 2016-03-28 13:23:53 -07:00
Jian He 0c84f9aee2 YARN-998. Keep NM resource updated through dynamic resource config for RM/NM restart. Contributed by Junping Du
(cherry picked from commit c7d843af3b)
2016-03-28 11:28:59 -07:00
Arun Suresh 1a194f8751 YARN-4823. Refactor the nested reservation id field in listReservation to simple string field. (subru via asuresh)
(cherry picked from commit 00bebb7e58)
2016-03-25 15:57:11 -07:00
Jason Lowe e06446be74 YARN-4814. ATS 1.5 timelineclient impl call flush after every event write. Contributed by Xuan Gong
(cherry picked from commit e8fc81f9c8)
2016-03-25 20:20:01 +00:00
Arun Suresh 945e3cd55c YARN-4687. Document Reservation ACLs (Contributed by Sean Po)
(cherry picked from commit 2e1d0ff4e9)
2016-03-24 10:42:07 -07:00
Arun Suresh 2399e1e46a YARN-4683. Document the List Reservations REST API. (Contributed by Sean Po)
(cherry picked from commit d820975c1a)
2016-03-24 10:32:13 -07:00
Arun Suresh 3c2b610b68 YARN-4825. Remove redundant code in ClientRMService::listReservations. (subru via asuresh)
(cherry picked from commit d82e797b65)
2016-03-24 10:02:17 -07:00
Junping Du 782db43d18 YARN-4820. ResourceManager web redirects in HA mode drops query parameters. Contributed by Varun Vasudev.
(cherry picked from commit 19b645c938)
(cherry picked from commit c722262c75)
2016-03-23 19:39:09 -07:00
Junping Du 762c7d4361 YARN-4814. ATS 1.5 timelineclient impl call flush after every event write. Contributed by Xuan Gong.
(cherry picked from commit af1d125f9c)
(cherry picked from commit 76602161c0)
2016-03-23 09:02:56 -07:00
Eric Payne 878e1cfc77 YARN-4686. MiniYARNCluster.start() returns before cluster is completely started. Contributed by Eric Badger.
(cherry picked from commit 92b7e0d413)
2016-03-18 17:19:06 +00:00
Junping Du 52ce763a54 YARN-4785. inconsistent value type of the type field for LeafQueueInfo in response of RM REST API.
(cherry picked from commit ca8106d2dd)
(cherry picked from commit 66257613b4)
2016-03-17 09:30:43 -07:00
Xuan d21bee170b Revert "YARN-4814. ATS 1.5 timelineclient impl call flush after every event write. (Xuan Gong via gtcarrera9)"
This reverts commit 3a0b695441.

(cherry picked from commit a888b5bc53)
(cherry picked from commit 398dbde538)
2016-03-15 22:12:05 -07:00
Li Lu 8640a9c45f YARN-4817. Change Log Level to DEBUG for putDomain call in ATS 1.5. (Xuan Gong via gtcarrera9)
(cherry-picked from commit 5176a69868)
2016-03-15 11:49:09 -07:00
Li Lu 0ebc947140 YARN-4814. ATS 1.5 timelineclient impl call flush after every event write. (Xuan Gong via gtcarrera9)
(cherry picked from commit 3a0b695441)
2016-03-15 11:43:39 -07:00
Junping Du 4f5b496b8a YARN-4545. Allow YARN distributed shell to use ATS v1.5 APIs. Li Lu via junping_du
(cherry picked from commit f291d82cd4)
(cherry picked from commit 3d5ac829da)
2016-03-14 08:34:08 -07:00
Li Lu 92e86ff0cb YARN-4696. Improving EntityGroupFSTimelineStore on exception handling, test setup, and concurrency.
This commit amends commit d49cfb3504 with a missed test file.

(cherry picked from commit 017d2c127b)
2016-03-10 13:06:02 -08:00
Li Lu 8e89bb9d38 YARN-4696. Improving EntityGroupFSTimelineStore on exception handling, test setup, and concurrency. (Steve Loughran via gtcarrera9)
(cherry-picked from commit d49cfb3504)
2016-03-10 10:58:51 -08:00
Allen Wittenauer 8b4a8ff1b2 Revert "HADOOP-12366. expose calculated paths (aw)"
This reverts commit 81a7ad45c9.
2016-03-09 09:59:33 -08:00
Chris Nauroth a3cd43990c HADOOP-12905. Clean up CHANGES.txt RAT exclusions from pom.xml files. Contributed by Chris Nauroth.
(cherry picked from commit 89b16d27e2)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/pom.xml
	hadoop-mapreduce-project/pom.xml

(cherry picked from commit 38a031ce68)
2016-03-08 21:23:07 -08:00
Wangda Tan 06088c4c67 YARN-4465. SchedulerUtils#validateRequest for Label check should happen only when nodelabel enabled. (Bibin A Chundatt via wangda)
(cherry picked from commit 0233d4e0ee)
2016-03-08 14:31:40 -08:00
Akira Ajisaka 2acd4c3bd2 HADOOP-12860. Expand section "Data Encryption on HTTP" in SecureMode documentation. Contributed by Wei-Chiu Chuang.
(cherry picked from commit f86850b544)
(cherry picked from commit 0586386472)
2016-03-08 14:30:01 +09:00
Jason Lowe 0d734cea44 YARN-4760. proxy redirect to history server uses wrong URL. Contributed by Eric Badger
(cherry picked from commit 4163e36c2b)
2016-03-07 15:58:01 +00:00
Jason Lowe 53ec7c9243 YARN-4744. Too many signal to container failure in case of LCE. Contributed by Sidharta Seethana
(cherry picked from commit 059caf9989)
2016-03-07 15:48:06 +00:00
Zhihai Xu 1a99d5ab97 YARN-4761. NMs reconnecting with changed capabilities can lead to wrong cluster resource calculations on fair scheduler. Contributed by Sangjin Lee
(cherry picked from commit e1ccc9622b)

Conflicts:
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestAbstractYarnScheduler.java
2016-03-06 20:03:55 -08:00
Masatake Iwasaki 9d551a3adf HADOOP-12470. In-page TOC of documentation should be automatically generated by doxia macro (iwasakims)
(cherry picked from commit cbd31328a6)

 Conflicts:
	hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md
	hadoop-common-project/hadoop-common/src/site/markdown/UnixShellGuide.md

(cherry picked from commit 722182fdfb)
2016-03-04 14:13:30 +09:00
Andrew Wang c6e37f6782 HADOOP-11792. Remove all of the CHANGES.txt files. 2016-03-03 21:03:13 -08:00
Jian He c50f79d838 YARN-4671. There is no need to acquire CS lock when completing a container. Contributed by Meng Ding 2016-03-01 13:15:37 -08:00
Jian He 475a277e60 YARN-4748. ApplicationHistoryManagerOnTimelineStore should not swallow exceptions on generateApplicationReport. Contributed by Li Lu
(cherry picked from commit d93c22ec27)
2016-02-29 18:19:49 -08:00
Haohui Mai 69b195d619 HADOOP-12813. Migrate TestRPC and related codes to rebase on ProtobufRpcEngine. Contributed by Kai Zheng. 2016-02-29 14:15:25 -08:00
Jason Lowe da9f00ac8b YARN-4723. NodesListManager$UnknownNodeId ClassCastException. Contributed by Kuhu Shukla
(cherry picked from commit 6b0f813e89)
2016-02-26 20:26:31 +00:00
Ming Ma 6f5ca1b293 YARN-4720. Skip unnecessary NN operations in log aggregation. (Jun Gong via mingma)
(cherry picked from commit 7f3139e54d)
2016-02-26 08:49:51 -08:00
Li Lu b22f4db3a0 YARN-4680. TimerTasks leak in ATS V1.5 Writer. (Xuan Gong via
gtcarrera9)

(cherry picked from commit 9e0f7b8b69)
2016-02-24 14:08:28 -08:00
Sangjin Lee 6b59e59865 YARN-4722. AsyncDispatcher logs redundant event queue sizes (Jason Lowe via sjlee)
(cherry picked from commit 553b591ba0)
2016-02-24 09:32:54 -08:00
Jason Lowe 6f3f5a8c38 YARN-2046. Out of band heartbeats are sent only on container kill and possibly too early. Contributed by Ming Ma
(cherry picked from commit d284e187b8)
2016-02-23 20:51:41 +00:00
Junping Du fe43f57c2a YARN-3223. Resource update during NM graceful decommission. Contributed by Brook Zhou.
(cherry picked from commit 9ed17f181d)
(cherry picked from commit e3ce0ffdc3)
2016-02-23 03:41:27 -08:00
Varun Vasudev 5f68f640a5 YARN-4709. NMWebServices produces incorrect JSON for containers. Contributed by Varun Saxena.
(cherry picked from commit 140cb5d745)
(cherry picked from commit 2c218ca8a8)
2016-02-23 12:33:11 +05:30
Zhe Zhang 6d4a4e785b HADOOP-12668. Support excluding weak Ciphers in HttpServer2 through ssl-server.conf. Contributed by Vijay Singh.
Change-Id: Ie46a5427d29188935427f67e55203c19fcd83335
2016-02-22 14:15:11 -08:00
Junping Du 606672a5b1 YARN-4386. refreshNodesGracefully() should send recommission event to active RMNodes only. Contributed by Kuhu Shukla.
(cherry picked from commit 3fab88540f)
(cherry picked from commit 7402448387)
2016-02-22 07:39:52 -08:00
Akira Ajisaka 8ddf5822f3 YARN-4707. Remove the extra char (>) from SecureContainer.md. Contributed by Brahma Reddy Battula.
(cherry picked from commit 5e7d4d51f8)
(cherry picked from commit 34635f9e37)
2016-02-22 17:18:17 +09:00
Rohith Sharma K S f18d092bda YARN-4654. Yarn node label CLI should parse "=" correctly when trying to remove all labels on a node. (Naganarasimha G R via rohithsharmaks)
(cherry picked from commit c1afac3a98)
2016-02-18 14:21:55 +05:30
Sangjin Lee 3a8c7ffeb4 YARN-4690. Skip object allocation in FSAppAttempt#getResourceUsage when possible (Ming Ma via sjlee)
(cherry picked from commit 7de70680fe)
2016-02-17 21:03:07 -08:00
Jian He e25d82bbc2 YARN-4653. Document YARN security model from the perspective of Application Developers. Contributed by Steve Loughran 2016-02-14 17:15:18 +08:00
Junping Du aed60ae0bf Set the release date for 2.6.4.
(cherry picked from commit ec12ce8f48)
(cherry picked from commit a28be9edc7)

Conflicts:

	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2016-02-13 01:48:50 -08:00
Steve Loughran 706351afb8 YARN-4682. AMRM client to log when AMRM token updated. (Prabhu Joseph via stevel) 2016-02-12 10:58:09 +00:00
Arun Suresh 379c2f4c05 YARN-2575. Create separate ACLs for Reservation create/update/delete/list ops (Sean Po via asuresh) 2016-02-11 15:54:45 -08:00
Jian He fc06ae38ca YARN-4138. Roll back container resource allocation after resource increase token expires. Contributed by Meng Ding 2016-02-11 10:42:45 +08:00
Jian He 145add1aec YARN-4519. Potential deadlock of CapacityScheduler between decrease container and assign containers. Contributed Meng Ding 2016-02-11 10:30:02 +08:00
= 9220bb649b YARN-4420. Add REST API for List Reservations. (Sean Po via curino)
(cherry picked from commit fc9eb4577c)
2016-02-10 14:41:38 -08:00