Repository: hadoop Updated Branches: refs/heads/branch-2 f2a5a5d4a -> 0974400b7
YARN-2507. Documented CrossOriginFilter configurations for the timeline server. Contributed by Jonathan Eagles. (cherry picked from commit 56dc496a1031621d2b701801de4ec29179d75f2e) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0974400b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0974400b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0974400b Branch: refs/heads/branch-2 Commit: 0974400b7401cebef0e9212d7400d868271876f9 Parents: f2a5a5d Author: Zhijie Shen <zjs...@apache.org> Authored: Sun Sep 7 18:22:40 2014 -0700 Committer: Zhijie Shen <zjs...@apache.org> Committed: Sun Sep 7 18:25:13 2014 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 ++ .../src/site/apt/TimelineServer.apt.vm | 37 ++++++++++++++++++++ 2 files changed, 40 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0974400b/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index a149028..8b362a5 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -164,6 +164,9 @@ Release 2.6.0 - UNRELEASED YARN-2512. Allowed pattern matching for origins in CrossOriginFilter. (Jonathan Eagles via zjshen) + YARN-2507. Documented CrossOriginFilter configurations for the timeline + server. (Jonathan Eagles via zjshen) + OPTIMIZATIONS BUG FIXES http://git-wip-us.apache.org/repos/asf/hadoop/blob/0974400b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/TimelineServer.apt.vm ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/TimelineServer.apt.vm b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/TimelineServer.apt.vm index c704d37..92c7377 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/TimelineServer.apt.vm +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/TimelineServer.apt.vm @@ -102,6 +102,43 @@ YARN Timeline Server <name>yarn.timeline-service.handler-thread-count</name> <value>10</value> </property> + +<property> + <description>Enables cross-origin support (CORS) for web services where + cross-origin web response headers are needed. For example, javascript making + a web services request to the timeline server.</description> + <name>yarn.timeline-service.http-cross-origin.enabled</name> + <value>false</value> +</property> + +<property> + <description>Comma separated list of origins that are allowed for web + services needing cross-origin (CORS) support. Wildcards (*) and patterns + allowed</description> + <name>yarn.timeline-service.http-cross-origin.allowed-origins</name> + <value>*</value> +</property> + +<property> + <description>Comma separated list of methods that are allowed for web + services needing cross-origin (CORS) support.</description> + <name>yarn.timeline-service.http-cross-origin.allowed-methods</name> + <value>GET,POST,HEAD</value> +</property> + +<property> + <description>Comma separated list of headers that are allowed for web + services needing cross-origin (CORS) support.</description> + <name>yarn.timeline-service.http-cross-origin.allowed-headers</name> + <value>X-Requested-With,Content-Type,Accept,Origin</value> +</property> + +<property> + <description>The number of seconds a pre-flighted request can be cached + for web services needing cross-origin (CORS) support.</description> + <name>yarn.timeline-service.http-cross-origin.max-age</name> + <value>1800</value> +</property> +---+ * Generic-data related Configuration
