diff options
| author | leyou240 <leyou240@live.cn> | 2022-04-18 10:39:29 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-18 10:39:29 +0800 |
| commit | 89eb87c1d16640030927af242b34eba47a149427 (patch) | |
| tree | e7bbc83368c814afa3d6c81c808738f91e32afd4 /other/java | |
| parent | 846c56e005243aca99dd4500b5680f340525a320 (diff) | |
| parent | b597baf488fa4449d41ac2b78d421751f65f909e (diff) | |
| download | seaweedfs-89eb87c1d16640030927af242b34eba47a149427.tar.xz seaweedfs-89eb87c1d16640030927af242b34eba47a149427.zip | |
Merge branch 'master' into slices.SortFunc
Diffstat (limited to 'other/java')
| -rw-r--r-- | other/java/client/src/main/proto/filer.proto | 3 | ||||
| -rw-r--r-- | other/java/hdfs-over-ftp/pom.xml | 2 | ||||
| -rw-r--r-- | other/java/hdfs3/pom.xml | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/other/java/client/src/main/proto/filer.proto b/other/java/client/src/main/proto/filer.proto index 35086e245..11be522e7 100644 --- a/other/java/client/src/main/proto/filer.proto +++ b/other/java/client/src/main/proto/filer.proto @@ -319,6 +319,9 @@ message PingRequest { string target_type = 2; } message PingResponse { + int64 start_time_ns = 1; + int64 remote_time_ns = 2; + int64 stop_time_ns = 3; } message GetFilerConfigurationRequest { diff --git a/other/java/hdfs-over-ftp/pom.xml b/other/java/hdfs-over-ftp/pom.xml index 3cae6437a..8b4f0e612 100644 --- a/other/java/hdfs-over-ftp/pom.xml +++ b/other/java/hdfs-over-ftp/pom.xml @@ -36,7 +36,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>3.2.2</version> + <version>3.2.3</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/other/java/hdfs3/pom.xml b/other/java/hdfs3/pom.xml index 345d19c0c..f25ecf986 100644 --- a/other/java/hdfs3/pom.xml +++ b/other/java/hdfs3/pom.xml @@ -6,7 +6,7 @@ <properties> <seaweedfs.client.version>2.85</seaweedfs.client.version> - <hadoop.version>3.1.4</hadoop.version> + <hadoop.version>3.2.3</hadoop.version> </properties> <groupId>com.github.chrislusf</groupId> |