You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by sb...@apache.org on 2016/02/19 03:44:14 UTC
[1/2] incubator-geode git commit: GEODE-905: HLL classes should
preserve original source header
Repository: incubator-geode
Updated Branches:
refs/heads/develop 4285d63a9 -> 5747787fd
GEODE-905: HLL classes should preserve original source header
Adding NOTICE from stream-lib project for HLL classes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/5747787f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/5747787f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/5747787f
Branch: refs/heads/develop
Commit: 5747787fd00de7ad66fde154f7d72b4080a1426e
Parents: bfc4280
Author: Swapnil Bawaskar <sb...@pivotal.io>
Authored: Thu Feb 18 13:13:25 2016 -0800
Committer: Swapnil Bawaskar <sb...@pivotal.io>
Committed: Thu Feb 18 18:38:27 2016 -0800
----------------------------------------------------------------------
NOTICE | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5747787f/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 7989bba..dfc5390 100644
--- a/NOTICE
+++ b/NOTICE
@@ -9,3 +9,13 @@ The following NOTICEs pertain to software distributed with this project.
Apache Log4j
Copyright 1999-2014 Apache Software Foundation
+
+stream-lib
+Copyright 2016 AddThis
+
+This product includes software developed by AddThis.
+
+This product also includes code adapted from:
+
+Apache Solr (http://lucene.apache.org/solr/)
+Copyright 2014 The Apache Software Foundation
[2/2] incubator-geode git commit: GEODE-905: HLL classes should
preserve original source header
Posted by sb...@apache.org.
GEODE-905: HLL classes should preserve original source header
Restoring the original headers.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/bfc42809
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/bfc42809
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/bfc42809
Branch: refs/heads/develop
Commit: bfc4280914b78286a8a76885046fcca1eb0dd73c
Parents: 4285d63
Author: Swapnil Bawaskar <sb...@pivotal.io>
Authored: Thu Feb 18 07:35:02 2016 -0800
Committer: Swapnil Bawaskar <sb...@pivotal.io>
Committed: Thu Feb 18 18:38:27 2016 -0800
----------------------------------------------------------------------
.../com/gemstone/gemfire/internal/hll/Bits.java | 19 +----------------
.../internal/hll/CardinalityMergeException.java | 22 +++-----------------
.../gemfire/internal/hll/HyperLogLog.java | 19 +----------------
.../gemfire/internal/hll/HyperLogLogPlus.java | 19 +----------------
.../gemstone/gemfire/internal/hll/IBuilder.java | 21 ++-----------------
.../gemfire/internal/hll/ICardinality.java | 21 ++-----------------
.../gemfire/internal/hll/MurmurHash.java | 16 --------------
.../gemfire/internal/hll/RegisterSet.java | 20 ++----------------
8 files changed, 12 insertions(+), 145 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bfc42809/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/Bits.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/Bits.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/Bits.java
index bd0b33c..351adbb 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/Bits.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/Bits.java
@@ -1,22 +1,4 @@
/*
- * 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.internal.hll;
-
-/*
* Copyright (C) 2011 Clearspring Technologies, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,6 +13,7 @@ package com.gemstone.gemfire.internal.hll;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package com.gemstone.gemfire.internal.hll;
import java.io.ByteArrayInputStream;
import java.io.DataInput;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bfc42809/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/CardinalityMergeException.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/CardinalityMergeException.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/CardinalityMergeException.java
index 5fd6b0b..e8ae3be 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/CardinalityMergeException.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/CardinalityMergeException.java
@@ -1,23 +1,5 @@
/*
- * 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.internal.hll;
-
-/*
- * Copyright (C) 2011 Clearspring Technologies, Inc.
+ * Copyright (C) 2011 Clearspring Technologies, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,6 +13,8 @@ package com.gemstone.gemfire.internal.hll;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package com.gemstone.gemfire.internal.hll;
+
@SuppressWarnings("serial")
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bfc42809/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/HyperLogLog.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/HyperLogLog.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/HyperLogLog.java
index fa5508d..7e88198 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/HyperLogLog.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/HyperLogLog.java
@@ -1,22 +1,4 @@
/*
- * 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.internal.hll;
-
-/*
* Copyright (C) 2012 Clearspring Technologies, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,6 +13,7 @@ package com.gemstone.gemfire.internal.hll;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package com.gemstone.gemfire.internal.hll;
import com.gemstone.gemfire.internal.redis.executor.hll.HllExecutor;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bfc42809/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/HyperLogLogPlus.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/HyperLogLogPlus.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/HyperLogLogPlus.java
index 7f04c38..86b74ef 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/HyperLogLogPlus.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/HyperLogLogPlus.java
@@ -1,22 +1,4 @@
/*
- * 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.internal.hll;
-
-/*
* Copyright (C) 2011 Clearspring Technologies, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,6 +13,7 @@ package com.gemstone.gemfire.internal.hll;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package com.gemstone.gemfire.internal.hll;
import com.gemstone.gemfire.internal.redis.executor.hll.Varint;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bfc42809/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/IBuilder.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/IBuilder.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/IBuilder.java
index bff40cd..0e74fe6 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/IBuilder.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/IBuilder.java
@@ -1,23 +1,5 @@
/*
- * 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.internal.hll;
-
-/*
- * Copyright (C) 2011 Clearspring Technologies, Inc.
+ * Copyright (C) 2011 Clearspring Technologies, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,6 +13,7 @@ package com.gemstone.gemfire.internal.hll;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package com.gemstone.gemfire.internal.hll;
public interface IBuilder<T> {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bfc42809/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/ICardinality.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/ICardinality.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/ICardinality.java
index 1671fe5..fd32154 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/ICardinality.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/ICardinality.java
@@ -1,23 +1,5 @@
/*
- * 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.internal.hll;
-
-/*
- * Copyright (C) 2011 Clearspring Technologies, Inc.
+ * Copyright (C) 2011 Clearspring Technologies, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,6 +13,7 @@ package com.gemstone.gemfire.internal.hll;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package com.gemstone.gemfire.internal.hll;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bfc42809/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/MurmurHash.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/MurmurHash.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/MurmurHash.java
index bab802e..139e029 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/MurmurHash.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/MurmurHash.java
@@ -16,22 +16,6 @@
*/
package com.gemstone.gemfire.internal.hll;
-/**
- * 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.
- */
/**
* This is a very fast, non-cryptographic hash suitable for general hash-based
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bfc42809/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/RegisterSet.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/RegisterSet.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/RegisterSet.java
index e1a1944..e35340f 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/RegisterSet.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/hll/RegisterSet.java
@@ -1,22 +1,4 @@
/*
- * 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.internal.hll;
-
-/*
* Copyright (C) 2012 Clearspring Technologies, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,6 +13,8 @@ package com.gemstone.gemfire.internal.hll;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package com.gemstone.gemfire.internal.hll;
+
public class RegisterSet {