Xiaoyu Yao 570b503e3e Fix merge conflicts

2019-01-15 22:54:50 -07:00

..

acceptance-test/src/test

Fix merge conflicts

2019-01-15 22:54:50 -07:00

client

HDDS-70. Fix config names for secure ksm and scm. Contributed by Ajay Kumar.

2019-01-15 22:53:55 -07:00

common

Fix merge conflicts

2019-01-15 22:54:50 -07:00

datanode

HDDS-602. Bump Ozone version to 0.4.0-SNAPSHOT after ozone-0.3 branch cut.

2018-10-09 19:04:25 +02:00

dev-support

HDDS-965. Ozone: checkstyle improvements and code quality scripts. Contributed by Elek, Marton.

2019-01-08 22:27:19 +01:00

dist

HDDS-924. MultipartUpload: S3 APi for complete Multipart Upload. Contributed by Bharat Viswanadham.

2019-01-08 15:48:48 +01:00

integration-test

Fix merge conflicts

2019-01-15 22:54:50 -07:00

objectstore-service

HDDS-941. Rename ChunkGroupInputStream to keyInputStream and ChunkInputStream to BlockInputStream. Contributed by Shashikant Banerjee.

2019-01-09 20:02:36 -08:00

ozone-manager

HDDS-70. Fix config names for secure ksm and scm. Contributed by Ajay Kumar.

2019-01-15 22:53:55 -07:00

ozonefs

HDDS-941. Rename ChunkGroupInputStream to keyInputStream and ChunkInputStream to BlockInputStream. Contributed by Shashikant Banerjee.

2019-01-09 20:02:36 -08:00

s3gateway

HDDS-941. Rename ChunkGroupInputStream to keyInputStream and ChunkInputStream to BlockInputStream. Contributed by Shashikant Banerjee.

2019-01-09 20:02:36 -08:00

tools

HDDS-965. Ozone: checkstyle improvements and code quality scripts. Contributed by Elek, Marton.

2019-01-08 22:27:19 +01:00

Jenkinsfile

HDDS-965. Ozone: checkstyle improvements and code quality scripts. Contributed by Elek, Marton.

2019-01-08 22:27:19 +01:00

pom.xml

HDDS-977. Exclude dependency-reduced-pom.xml from ozone rat check. Contributed by Elek, Marton.

2019-01-14 16:30:21 -08:00