You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by hi...@apache.org on 2016/06/15 17:55:40 UTC
incubator-geode git commit: GEODE-1372 added .rej and .orig filter
for rat and gitignore
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-1372 b27967a3e -> 8bf10a5e8
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/8bf10a5e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/8bf10a5e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/8bf10a5e
Branch: refs/heads/feature/GEODE-1372
Commit: 8bf10a5e849f41c1e552cb440a2d5e713e5e2332
Parents: b27967a
Author: Hitesh Khamesra <hi...@yahoo.com>
Authored: Wed Jun 15 10:54:40 2016 -0700
Committer: Hitesh Khamesra <hi...@yahoo.com>
Committed: Wed Jun 15 10:54:40 2016 -0700
----------------------------------------------------------------------
.gitignore | 2 ++
.../gms/messenger/GMSEncryptJUnitTest.java | 19 ++++++++++++++++---
.../lucene/LuceneQueriesIntegrationTest.java | 2 +-
gradle/rat.gradle | 2 ++
4 files changed, 21 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf10a5e/.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/8bf10a5e/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 32e8558..a5af277 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/8bf10a5e/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesIntegrationTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesIntegrationTest.java
index 95f5781..f6aaa12 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesIntegrationTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesIntegrationTest.java
@@ -249,7 +249,7 @@ public class LuceneQueriesIntegrationTest extends LuceneIntegrationTest {
private void verifyQuery(String query, HashMap expectedResults) throws ParseException {
final LuceneQuery<String, Object> queryWithStandardAnalyzer = luceneService.createLuceneQueryFactory().create(
- INDEX_NAME, REGION_NAME, query);
+ INDEX_NAME, REGION_NAME, query, DEFAULT_FIELD);
verifyQueryKeyAndValues(queryWithStandardAnalyzer, expectedResults);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf10a5e/gradle/rat.gradle
----------------------------------------------------------------------
diff --git a/gradle/rat.gradle b/gradle/rat.gradle
index 93cb91c..099c990 100644
--- a/gradle/rat.gradle
+++ b/gradle/rat.gradle
@@ -67,6 +67,8 @@ rat {
'**/*.log',
'**/*.patch',
'**/*.diff',
+ '**/*.rej',
+ '**/*.orig',
'**/*.MF',
// binary files