Merge branch 'trunk' into HDFS-7240

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

Branch: refs/heads/HDFS-7240
Commit: 3d9a949183bc31839e1447af37ad360192a22b8c
Parents: 06d228a ea95a33
Author: Xiaoyu Yao <x...@apache.org>
Authored: Mon Apr 16 10:44:54 2018 -0700
Committer: Xiaoyu Yao <x...@apache.org>
Committed: Mon Apr 16 10:44:54 2018 -0700

----------------------------------------------------------------------
 hadoop-project-dist/pom.xml                     |   4 +-
 hadoop-project/pom.xml                          | 158 +++++++++----------
 .../hadoop/yarn/conf/YarnConfiguration.java     |   2 +-
 .../src/main/resources/yarn-default.xml         |   2 +-
 ...TestCapacitySchedulerSurgicalPreemption.java | 150 ++++++++++++++++++
 ...TestPerNodeTimelineCollectorsAuxService.java |   2 +
 .../src/site/markdown/TimelineServiceV2.md      |   2 +-
 pom.xml                                         |  27 ++++
 8 files changed, 263 insertions(+), 84 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/3d9a9491/hadoop-project/pom.xml
----------------------------------------------------------------------
diff --cc hadoop-project/pom.xml
index 4595c28,02ea0ba..4e76f4b
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@@ -560,115 -558,8 +560,115 @@@
  
        <dependency>
          <groupId>org.apache.hadoop</groupId>
 +        <artifactId>hadoop-ozone</artifactId>
 +        <version>${project.version}</version>
 +      </dependency>
 +      <dependency>
 +        <groupId>org.apache.hadoop</groupId>
 +        <artifactId>hadoop-ozone-objectstore-service</artifactId>
 +        <version>${project.version}</version>
 +      </dependency>
 +
 +      <dependency>
 +        <groupId>org.apache.hadoop</groupId>
 +        <artifactId>hadoop-hdds-common</artifactId>
 +        <version>${project.version}</version>
 +      </dependency>
 +
 +      <dependency>
 +        <groupId>org.apache.hadoop</groupId>
 +        <artifactId>hadoop-hdds-client</artifactId>
 +        <version>${project.version}</version>
 +      </dependency>
 +      <dependency>
 +        <groupId>org.apache.hadoop</groupId>
 +        <artifactId>hadoop-hdds-tools</artifactId>
 +        <version>${project.version}</version>
 +      </dependency>
 +      <dependency>
 +        <groupId>org.apache.hadoop</groupId>
 +        <artifactId>hadoop-ozone-tools</artifactId>
 +        <version>${project.version}</version>
 +      </dependency>
 +      <dependency>
 +        <groupId>org.apache.hadoop</groupId>
 +        <artifactId>hadoop-ozone-integration-test</artifactId>
 +        <version>${project.version}</version>
 +        <type>test-jar</type>
 +      </dependency>
 +
 +      <dependency>
 +        <groupId>org.apache.hadoop</groupId>
 +        <artifactId>hadoop-hdds-server-framework</artifactId>
 +        <version>${project.version}</version>
 +      </dependency>
 +
 +      <dependency>
 +        <groupId>org.apache.hadoop</groupId>
 +        <artifactId>hadoop-hdds-server-scm</artifactId>
 +        <version>${project.version}</version>
 +      </dependency>
 +
 +      <dependency>
 +        <groupId>org.apache.hadoop</groupId>
 +        <artifactId>hadoop-hdds-container-service</artifactId>
 +        <version>${project.version}</version>
 +      </dependency>
 +      <dependency>
 +        <groupId>org.apache.hadoop</groupId>
 +        <artifactId>hadoop-hdds-container-service</artifactId>
 +        <version>${project.version}</version>
 +        <type>test-jar</type>
 +      </dependency>
 +
 +      <dependency>
 +        <groupId>org.apache.hadoop</groupId>
 +        <artifactId>hadoop-hdds-server-scm</artifactId>
 +        <type>test-jar</type>
 +        <version>${project.version}</version>
 +      </dependency>
 +
 +
 +      <dependency>
 +        <groupId>org.apache.hadoop</groupId>
 +        <artifactId>hadoop-ozone-common</artifactId>
 +        <version>${project.version}</version>
 +      </dependency>
 +
 +      <dependency>
 +        <groupId>org.apache.hadoop</groupId>
 +        <artifactId>hadoop-ozone-ozone-manager</artifactId>
 +        <version>${project.version}</version>
 +      </dependency>
 +      <dependency>
 +        <groupId>org.apache.hadoop</groupId>
 +        <artifactId>hadoop-ozone-ozone-manager</artifactId>
 +        <version>${project.version}</version>
 +        <type>test-jar</type>
 +      </dependency>
 +
 +      <dependency>
 +        <groupId>org.apache.hadoop</groupId>
 +        <artifactId>hadoop-ozone-client</artifactId>
 +        <version>${project.version}</version>
 +      </dependency>
 +
 +      <dependency>
 +        <groupId>org.openjdk.jmh</groupId>
 +        <artifactId>jmh-core</artifactId>
 +        <version>1.19</version>
 +      </dependency>
 +      <dependency>
 +        <groupId>org.openjdk.jmh</groupId>
 +        <artifactId>jmh-generator-annprocess</artifactId>
 +        <version>1.19</version>
 +      </dependency>
 +
 +
 +      <dependency>
 +        <groupId>org.apache.hadoop</groupId>
          <artifactId>hadoop-kms</artifactId>
-         <version>${project.version}</version>
+         <version>${hadoop.version}</version>
        </dependency>
        <dependency>
          <groupId>org.apache.hadoop</groupId>

http://git-wip-us.apache.org/repos/asf/hadoop/blob/3d9a9491/pom.xml
----------------------------------------------------------------------


---------------------------------------------------------------------
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