GEODE-1372 added .rej and .orig filter for rat and gitignore Fixed header in GMSEncryptJunitTest. Fixed compilation error in Lucene test
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/a391b213 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/a391b213 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/a391b213 Branch: refs/heads/develop Commit: a391b2136ae1177868022fb6c5722e64d18f0d93 Parents: 95aa2e2 Author: Hitesh Khamesra <[email protected]> Authored: Wed Jun 15 10:54:40 2016 -0700 Committer: Hitesh Khamesra <[email protected]> Committed: Mon Aug 29 10:39:19 2016 -0700 ---------------------------------------------------------------------- .gitignore | 2 ++ .../gms/messenger/GMSEncryptJUnitTest.java | 19 ++++++++++++++++--- gradle/rat.gradle | 2 ++ 3 files changed, 20 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a391b213/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 1b9dd0a..825e379 100644 --- a/.gitignore +++ b/.gitignore @@ -21,5 +21,7 @@ build-eclipse/ *.patch *.diff *.dat +*.rej +*.orig geode-spark-connector/**/target/ geode-spark-connector/project/project/ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a391b213/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java index 2b1ae26..eb77da4 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java @@ -1,3 +1,19 @@ +/* + * 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. + */ package com.gemstone.gemfire.distributed.internal.membership.gms.messenger; import static org.mockito.Mockito.*; @@ -35,9 +51,6 @@ import javax.crypto.Mac; import javax.crypto.SecretKey; import javax.crypto.spec.DHParameterSpec; -/** - * Created by bschuchardt on 5/6/2016. - */ @Category(IntegrationTest.class) public class GMSEncryptJUnitTest { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a391b213/gradle/rat.gradle ---------------------------------------------------------------------- diff --git a/gradle/rat.gradle b/gradle/rat.gradle index 0ce82b9..59caeaf 100644 --- a/gradle/rat.gradle +++ b/gradle/rat.gradle @@ -72,6 +72,8 @@ rat { '**/*.log', '**/*.patch', '**/*.diff', + '**/*.rej', + '**/*.orig', '**/*.MF', // binary files
