Repository: hadoop Updated Branches: refs/heads/branch-2.7 aa5eab8ec -> 996b0ca17
HADOOP-11377. Added Null.java without which jdiff completely flops. Contributed by Tsuyoshi Ozawa. (cherry picked from commit 5370e7128b4b78dabff79986a92151f1de39eeed) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/996b0ca1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/996b0ca1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/996b0ca1 Branch: refs/heads/branch-2.7 Commit: 996b0ca17396ec80bb02869f9f53cc1e642d6fe3 Parents: aa5eab8 Author: Vinod Kumar Vavilapalli <[email protected]> Authored: Sat Apr 4 13:47:08 2015 -0700 Committer: Vinod Kumar Vavilapalli <[email protected]> Committed: Sat Apr 4 13:48:58 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../hadoop-common/dev-support/jdiff/Null.java | 20 ++++++++++++++++++++ .../hadoop-hdfs/dev-support/jdiff/Null.java | 20 ++++++++++++++++++++ 3 files changed, 43 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/996b0ca1/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 467be0e..ab39df3 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -718,6 +718,9 @@ Release 2.7.0 - UNRELEASED HADOOP-11757. NFS gateway should shutdown when it can't start UDP or TCP server (brandonli) + + HADOOP-11377. Added Null.java without which jdiff completely flops. (Tsuyoshi + Ozawa via vinodkv) Release 2.6.1 - UNRELEASED http://git-wip-us.apache.org/repos/asf/hadoop/blob/996b0ca1/hadoop-common-project/hadoop-common/dev-support/jdiff/Null.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/dev-support/jdiff/Null.java b/hadoop-common-project/hadoop-common/dev-support/jdiff/Null.java new file mode 100644 index 0000000..7b00145 --- /dev/null +++ b/hadoop-common-project/hadoop-common/dev-support/jdiff/Null.java @@ -0,0 +1,20 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +public class Null { + public Null() { } +} http://git-wip-us.apache.org/repos/asf/hadoop/blob/996b0ca1/hadoop-hdfs-project/hadoop-hdfs/dev-support/jdiff/Null.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/dev-support/jdiff/Null.java b/hadoop-hdfs-project/hadoop-hdfs/dev-support/jdiff/Null.java new file mode 100644 index 0000000..7b00145 --- /dev/null +++ b/hadoop-hdfs-project/hadoop-hdfs/dev-support/jdiff/Null.java @@ -0,0 +1,20 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +public class Null { + public Null() { } +}
