Repository: hadoop Updated Branches: refs/heads/branch-2 f4b234850 -> 7a668981f
HADOOP-12362. Set hadoop.tmp.dir and hadoop.log.dir in pom. Contributed by Charlie Helin. (cherry picked from commit 90fe7bcc3b30f8497d7a5124c91c5aea28f2fccb) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7a668981 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7a668981 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7a668981 Branch: refs/heads/branch-2 Commit: 7a668981f5aeaba4b6e87363a51f8e4fae965837 Parents: f4b2348 Author: Andrew Wang <[email protected]> Authored: Thu Aug 27 10:17:00 2015 -0700 Committer: Andrew Wang <[email protected]> Committed: Thu Aug 27 10:17:04 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ hadoop-project/pom.xml | 4 ++-- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7a668981/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 15ec117..8348f98 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -582,6 +582,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12347. Fix mismatch parameter name in javadocs of AuthToken#setMaxInactives (xyao) + HADOOP-12362. Set hadoop.tmp.dir and hadoop.log.dir in pom. + (Charlie Helin via wang) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/7a668981/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 0ce2896..d4dbeee 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -1168,14 +1168,14 @@ </environmentVariables> <systemPropertyVariables> + <hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir> + <hadoop.tmp.dir>${project.build.directory}/tmp</hadoop.tmp.dir> <!-- TODO: all references in testcases should be updated to this default --> <test.build.dir>${test.build.dir}</test.build.dir> - <hadoop.tmp.dir>${hadoop.tmp.dir}</hadoop.tmp.dir> <test.build.data>${test.build.data}</test.build.data> <test.build.webapps>${test.build.webapps}</test.build.webapps> <test.cache.data>${test.cache.data}</test.cache.data> - <hadoop.log.dir>${hadoop.log.dir}</hadoop.log.dir> <test.build.classes>${test.build.classes}</test.build.classes> <java.net.preferIPv4Stack>true</java.net.preferIPv4Stack> http://git-wip-us.apache.org/repos/asf/hadoop/blob/7a668981/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml index ba21bbe..bc40195 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml @@ -187,14 +187,14 @@ </environmentVariables> <systemPropertyVariables> + <hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir> + <hadoop.tmp.dir>${project.build.directory}/tmp</hadoop.tmp.dir> <!-- TODO: all references in testcases should be updated to this default --> <test.build.dir>${test.build.dir}</test.build.dir> - <hadoop.tmp.dir>${hadoop.tmp.dir}</hadoop.tmp.dir> <test.build.data>${test.build.data}</test.build.data> <test.build.webapps>${test.build.webapps}</test.build.webapps> <test.cache.data>${test.cache.data}</test.cache.data> - <hadoop.log.dir>${hadoop.log.dir}</hadoop.log.dir> <test.build.classes>${test.build.classes}</test.build.classes> <java.net.preferIPv4Stack>true</java.net.preferIPv4Stack>
