Repository: hadoop Updated Branches: refs/heads/branch-2 9e9143329 -> 236d1a509
YARN-4706. UI Hosting Configuration in TimelineServer doc is broken. (Akira AJISAKA via gtcarrera9) (cherry picked from commit f61de4173684aa1767cef20b3cb4d54df20273cd) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/236d1a50 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/236d1a50 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/236d1a50 Branch: refs/heads/branch-2 Commit: 236d1a5093fd1f4cddae6bc6d1efe9e31cea6eea Parents: 9e91433 Author: Li Lu <gtcarre...@apache.org> Authored: Mon Apr 4 14:39:47 2016 -0700 Committer: Li Lu <gtcarre...@apache.org> Committed: Mon Apr 4 14:41:40 2016 -0700 ---------------------------------------------------------------------- .../hadoop-yarn-site/src/site/markdown/TimelineServer.md | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/236d1a50/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServer.md ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServer.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServer.md index 9283e58..f20bd2c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServer.md +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServer.md @@ -56,6 +56,7 @@ With the introduction of the timeline server, the Application History Server bec the Timeline Server. Generic information includes application level data such as + * queue-name, * user information and the like set in the `ApplicationSubmissionContext`, * a list of application-attempts that ran for an application @@ -192,6 +193,7 @@ selected if this policy is `HTTPS_ONLY`. #### UI Hosting Configuration The timeline service can host multiple UIs if enabled. The service can support both static web sites hosted in a directory or war files bundled. The web UI is then hosted on the timeline service HTTP port under the path configured. + | Configuration Property | Description | |:---- |:---- | | `yarn.timeline-service.ui-names` | Comma separated list of UIs that will be hosted. Defaults to `none`. |
