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

2538 Commits

Author SHA1 Message Date
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
Arun Suresh 685aeeb1a7 YARN-4360. Improve GreedyReservationAgent to support "early" allocations, and performance improvements (curino via asuresh) 
(cherry picked from commit 5cf5c41a89)
 2016-02-10 09:13:31 -08:00
Jason Lowe 5d653a3fd1 Update CHANGES.txt to reflect recent commits to branch-2.7 and branch-2.6. 
(cherry picked from commit fba6e9f5ef)
 2016-02-09 16:56:12 +00:00
Devaraj K 35651bab99 YARN-4667. RM Admin CLI for refreshNodesResources throws NPE when nothing 
is configured. Contributed by Naganarasimha G R.

(cherry picked from commit 565af873d5)
 2016-02-08 15:04:15 +05:30
Xuan acd90c6819 YARN-4662. Document some newly added metrics. Contributed by Jian He 
(cherry picked from commit 63c63e298c)
(cherry picked from commit dfad608b22)
 2016-02-03 20:06:57 -08:00
Junping Du 847158811b Adding release 2.6.5 to CHANGES.txt 2016-02-02 18:36:39 -08:00
Devaraj K aeea77ce14 YARN-4100. Add Documentation for Distributed and Delegated-Centralized 
Node Labels feature. Contributed by Naganarasimha G R.

(cherry picked from commit db144eb1c5)
 2016-02-02 12:08:56 +05:30
Wangda Tan c487453b91 YARN-4340. Add list API to reservation system. (Sean Po via wangda) 
(cherry picked from commit 9875325d5c)
 2016-02-02 10:23:25 +08:00
Jason Lowe 9862879e27 YARN-3102. Decommisioned Nodes not listed in Web UI. Contributed by Kuhu Shukla 
(cherry picked from commit ed55950164)
 2016-02-01 23:17:02 +00:00
Jason Lowe a9916057e3 YARN-4428. Redirect RM page to AHS page when AHS turned on and RM page is not available. Contributed by Chang Li 
(cherry picked from commit 772ea7b41b)
 2016-01-29 21:55:38 +00:00
Jian He e45799a61b YARN-4617. LeafQueue#pendingOrderingPolicy should always use fixed ordering policy instead of using same as active applications ordering policy. Contributed by Rohith Sharma K S 
(cherry picked from commit f4a57d4a53)
 2016-01-29 12:23:02 -08:00
Devaraj K eb2366eda1 YARN-4411. RMAppAttemptImpl#createApplicationAttemptReport throws 
IllegalArgumentException. Contributed by Bibin A Chundatt and yarntime.

(cherry picked from commit a277bdc9ed)
 2016-01-29 13:53:29 +05:30
Rohith Sharma K S d28b5b0c5c YARN-4219. addendum patch to fix javadoc errors 
(cherry picked from commit 09d831c95b)
 2016-01-29 11:53:51 +05:30
Xuan 353518f54c YARN-4219. New levelDB cache storage for timeline v1.5. Contributed by 
Li Lu

(cherry picked from commit 9fab22b366)
(cherry picked from commit 2f00d8d3a7)
 2016-01-28 14:37:27 -08:00
Jason Lowe 290b7db656 YARN-4643. Container recovery is broken with delegating container runtime. Contributed by Sidharta Seethana 
(cherry picked from commit 61382ff8fa)
 2016-01-28 19:01:28 +00:00
Vinod Kumar Vavilapalli (I am also known as @tshooter.) 3efc72ccd5 Release process for 2.7.2: Set the release date for 2.7.2 
(cherry picked from commit ec4d2d9f40)
 2016-01-25 15:47:39 -08:00
Jian He 389a7fb33f YARN-4520. Finished app info is unnecessarily persisted in NM state-store if container is acquired but not lunched on this node. Contributed by sandflee 2016-01-25 15:36:59 -08:00
Jason Lowe 435b6ae82b YARN-4452. NPE when submit Unmanaged application. Contributed by Naganarasimha G R. 
(cherry picked from commit 50bd067e1d)

Conflicts:

	hadoop-yarn-project/CHANGES.txt
 2016-01-25 16:11:59 +00:00
Jason Lowe a025b7b7ea Revert "YARN-4452. NPE when submit Unmanaged application. Contributed by Naganarasimha G R." 
This reverts commit 92de57bdca.

Conflicts:

	hadoop-yarn-project/CHANGES.txt
 2016-01-25 16:03:27 +00:00
Akira Ajisaka a7e84dad41 YARN-4592. Remove unused GetContainerStatus proto. Contributed by Chang Li. 
(cherry picked from commit 56a0c17508)
(cherry picked from commit 02d4a1fce3)
 2016-01-25 15:20:57 +09:00
rohithsharmaks 80928af293 YARN-4614. Fix random failure in TestApplicationPriority#testApplicationPriorityAllocationWithChangeInPriority. (Sunil G via rohithsharmaks) 
(cherry picked from commit 99829eb221)
 2016-01-23 07:59:08 +05:30
Jason Lowe c1953e5e91 YARN-4598. Invalid event: RESOURCE_FAILED at CONTAINER_CLEANEDUP_AFTER_KILL. Contributed by tangshangwen 
(cherry picked from commit 46e5ea81e0)
 2016-01-22 21:56:37 +00:00
Jason Lowe e2762f035f YARN-4371. "yarn application -kill" should take multiple application ids. Contributed by Sunil G 
(cherry picked from commit e91e8b711c)
 2016-01-22 21:37:41 +00:00
Akira Ajisaka ecba5f2ed3 YARN-4605. Spelling mistake in the help message of "yarn applicationattempt" command. Contributed by Weiwei Yang. 
(cherry picked from commit 8f58f742ae)
(cherry picked from commit ddc22bbcb1)
 2016-01-22 19:47:57 +09:00
Jason Lowe d856f82b73 YARN-4610. Reservations continue looking for one app causes other apps to starve. Contributed by Jason Lowe 
(cherry picked from commit 468a53b22f)
 2016-01-21 18:34:03 +00:00
Akira Ajisaka a2d73b185f YARN-4608. Redundant code statement in WritingYarnApplications. Contributed by Kai Sasaki. 
(cherry picked from commit d3224e2d6274daf73a103c0dbe21ba69add7ca26)
(cherry picked from commit 01cd6dce63f2ac21a52f6f2539cb222e895044eb)
 2016-01-22 02:15:16 +09:00
Jason Lowe 15e84fd626 YARN-4492. Add documentation for preemption supported in Capacity scheduler. Contributed by Naganarasimha G R 
(cherry picked from commit f858ac2426)
 2016-01-21 15:40:30 +00:00
Colin Patrick Mccabe de5175d216 HADOOP-12712. Fix some cmake plugin and native build warnings (cmccabe) 
(cherry picked from commit b2c155f810)

 Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
	hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/cmakebuilder/CompileMojo.java
	hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/cmakebuilder/TestMojo.java
	hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/util/Exec.java
 2016-01-21 16:04:05 +05:30
Wangda Tan ada560bc4e YARN-4557. Fix improper Queues sorting in PartitionedQueueComparator when accessible-node-labels=*. (Naganarasimha G R via wangda) 
(cherry picked from commit c9fe0371a8ab40c0d3437fadd32788b320788a7a)
 2016-01-21 11:19:09 +08:00
Wangda Tan 5dc2e78c97 HADOOP-12356. Fix computing CPU usage statistics on Windows. (Inigo Goiri via wangda) 
(cherry picked from commit 89d1fd5dac)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
 2016-01-19 21:31:35 +08:00
Jian He 914a8fff56 YARN-4565. Fix a bug that leads to AM resource limit not hornored when sizeBasedWeight enabled for FairOrderingPolicy. Contributed by Wangda Tan 2016-01-18 21:05:21 -08:00
Wangda Tan 2a2ea38a9b YARN-4502. Fix two AM containers get allocated when AM restart. (Vinod Kumar Vavilapalli via wangda) 
(cherry picked from commit a44ce3f14f)
 2016-01-19 09:33:52 +08:00
Wangda Tan bacb38aaf3 Revert "YARN-4502. Fix two AM containers get allocated when AM restart. (Vinod Kumar Vavilapalli via wangda)" 
This reverts commit 3fe5728563.

Conflicts:
	hadoop-yarn-project/CHANGES.txt

(cherry picked from commit 150f5ae034)
 2016-01-19 09:33:47 +08:00
Jian He cdef283cd0 YARN-4596. SystemMetricPublisher should not swallow error messages from TimelineClient#putEntities. Contributed by Li Lu 2016-01-18 16:59:24 -08:00
rohithsharmaks c70322d1cf YARN-4265 Addendum patch to fix compilation issue caused by project version number 2016-01-18 16:38:52 +05:30
Wangda Tan 1cb0ad00bb YARN-4502. Fix two AM containers get allocated when AM restart. (Vinod Kumar Vavilapalli via wangda) 
(cherry picked from commit 805a9ed85e)
(cherry picked from commit 6dab78c71a)
 2016-01-18 17:08:42 +08:00