Repository: hadoop
Updated Branches:
  refs/heads/branch-3.2.0 b990d5943 -> ded047b06


YARN-8687. Update YARN service file type in documentation.
           Contributed by Suma Shivaprasad

(cherry picked from commit ba7e81667ce12d5cf9d87ee18a8627323759cee0)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ded047b0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ded047b0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ded047b0

Branch: refs/heads/branch-3.2.0
Commit: ded047b06faf917e39a5459de62865a51d2809a5
Parents: b990d59
Author: Eric Yang <ey...@apache.org>
Authored: Thu Oct 18 12:02:10 2018 -0400
Committer: Sunil G <sun...@apache.org>
Committed: Mon Nov 5 23:26:18 2018 +0530

----------------------------------------------------------------------
 .../hadoop-yarn-site/src/site/markdown/yarn-service/Examples.md    | 2 +-
 .../src/site/markdown/yarn-service/YarnServiceAPI.md               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/ded047b0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/yarn-service/Examples.md
----------------------------------------------------------------------
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/yarn-service/Examples.md
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/yarn-service/Examples.md
index 73e00b3..da7a9c4 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/yarn-service/Examples.md
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/yarn-service/Examples.md
@@ -48,7 +48,7 @@ Note this example requires registry DNS.
       "configuration": {
         "files": [
           {
-            "type": "ENV",
+            "type": "TEMPLATE",
             "dest_file": "/var/www/html/index.html",
             "properties": {
               "content": 
"<html><header><title>Title</title></header><body>Hello from 
${COMPONENT_INSTANCE_NAME}!</body></html>"

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ded047b0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/yarn-service/YarnServiceAPI.md
----------------------------------------------------------------------
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/yarn-service/YarnServiceAPI.md
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/yarn-service/YarnServiceAPI.md
index 7b1e74a..fe49158 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/yarn-service/YarnServiceAPI.md
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/yarn-service/YarnServiceAPI.md
@@ -252,7 +252,7 @@ A config file that needs to be created and made available 
as a volume in a servi
 
 |Name|Description|Required|Schema|Default|
 |----|----|----|----|----|
-|type|Config file in the standard format like xml, properties, json, yaml, 
template or static/archive resource files. When static/archive types are 
specified, file must be uploaded to remote file system before launching the 
job, and YARN service framework will localize files prior to launching 
containers. Archive files are unwrapped during localization |false|enum (XML, 
PROPERTIES, JSON, YAML, TEMPLATE, ENV, HADOOP_XML, STATIC, ARCHIVE)||
+|type|Config file in the standard format like xml, properties, json, yaml, 
template or static/archive resource files. When static/archive types are 
specified, file must be uploaded to remote file system before launching the 
job, and YARN service framework will localize files prior to launching 
containers. Archive files are unwrapped during localization |false|enum (XML, 
PROPERTIES, JSON, YAML, TEMPLATE, HADOOP_XML, STATIC, ARCHIVE)||
 |dest_file|The path that this configuration file should be created as. If it 
is an absolute path, it will be mounted into the DOCKER container. Absolute 
paths are only allowed for DOCKER containers.  If it is a relative path, only 
the file name should be provided, and the file will be created in the container 
local working directory under a folder named conf for all types other than 
static/archive. For static/archive resource types, the files are available 
under resources directory.|false|string||
 |src_file|This provides the source location of the configuration file, the 
content of which is dumped to dest_file post property substitutions, in the 
format as specified in type. Typically the src_file would point to a source 
controlled network accessible file maintained by tools like puppet, chef, or 
hdfs etc. Currently, only hdfs is supported.|false|string||
 |properties|A blob of key value pairs that will be dumped in the dest_file in 
the format as specified in type. If src_file is specified, src_file content are 
dumped in the dest_file and these properties will overwrite, if any, existing 
properties in src_file or be added as new properties in src_file.|false|object||


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

Reply via email to