You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2015/10/04 00:18:14 UTC
[1/6] accumulo git commit: ACCUMULO-3989 Remove lingering headers
containing copyright year.
Repository: accumulo
Updated Branches:
refs/heads/1.6 25f74cd7b -> c8697519e
refs/heads/1.7 7b5ad53bc -> 8532f0759
refs/heads/master 5a2396eef -> 647cfb74f
ACCUMULO-3989 Remove lingering headers containing copyright year.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c8697519
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c8697519
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c8697519
Branch: refs/heads/1.6
Commit: c8697519e2bfbcb1752c2293b7593eb308986939
Parents: 25f74cd
Author: Josh Elser <el...@apache.org>
Authored: Sat Oct 3 18:17:06 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sat Oct 3 18:17:06 2015 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/core/file/blockfile/cache/BlockCache.java | 2 --
.../org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java | 2 --
.../accumulo/core/file/blockfile/cache/CachedBlockQueue.java | 2 --
.../org/apache/accumulo/core/file/blockfile/cache/ClassSize.java | 2 --
.../org/apache/accumulo/core/file/blockfile/cache/HeapSize.java | 2 --
.../apache/accumulo/core/file/blockfile/cache/LruBlockCache.java | 2 --
.../accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java | 2 --
.../accumulo/core/file/blockfile/cache/TestLruBlockCache.java | 2 --
8 files changed, 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8697519/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/BlockCache.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/BlockCache.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/BlockCache.java
index a6c08ff..3c9af33 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/BlockCache.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/BlockCache.java
@@ -1,6 +1,4 @@
/*
- * Copyright 2009 The Apache Software Foundation
- *
* 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
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8697519/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java
index b6d6d41..9e99cfb 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java
@@ -1,6 +1,4 @@
/*
- * Copyright 2009 The Apache Software Foundation
- *
* 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
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8697519/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java
index d08fee1..0c35b98 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java
@@ -1,6 +1,4 @@
/*
- * Copyright 2009 The Apache Software Foundation
- *
* 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
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8697519/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/ClassSize.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/ClassSize.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/ClassSize.java
index 2d7586f..f898a8f 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/ClassSize.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/ClassSize.java
@@ -1,6 +1,4 @@
/*
- * Copyright 2009 The Apache Software Foundation
- *
* 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
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8697519/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/HeapSize.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/HeapSize.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/HeapSize.java
index 04db3cd..59e94dd 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/HeapSize.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/HeapSize.java
@@ -1,6 +1,4 @@
/*
- * Copyright 2009 The Apache Software Foundation
- *
* 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
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8697519/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/LruBlockCache.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/LruBlockCache.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/LruBlockCache.java
index 6cab164..cc9d94f 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/LruBlockCache.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/LruBlockCache.java
@@ -1,6 +1,4 @@
/*
- * Copyright 2009 The Apache Software Foundation
- *
* 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
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8697519/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java b/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java
index 940fcf8..e88b4a9 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java
@@ -1,6 +1,4 @@
/*
- * Copyright 2009 The Apache Software Foundation
- *
* 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
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8697519/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java b/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java
index 88d61ac..15abbaf 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java
@@ -1,6 +1,4 @@
/*
- * Copyright 2009 The Apache Software Foundation
- *
* 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
[4/6] accumulo git commit: Merge branch '1.6' into 1.7
Posted by el...@apache.org.
Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8532f075
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8532f075
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8532f075
Branch: refs/heads/master
Commit: 8532f075938d8063364a066950d43dad520b9d66
Parents: 7b5ad53 c869751
Author: Josh Elser <el...@apache.org>
Authored: Sat Oct 3 18:17:52 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sat Oct 3 18:17:52 2015 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/core/file/blockfile/cache/BlockCache.java | 2 --
.../org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java | 2 --
.../accumulo/core/file/blockfile/cache/CachedBlockQueue.java | 2 --
.../org/apache/accumulo/core/file/blockfile/cache/ClassSize.java | 2 --
.../org/apache/accumulo/core/file/blockfile/cache/HeapSize.java | 2 --
.../apache/accumulo/core/file/blockfile/cache/LruBlockCache.java | 2 --
.../accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java | 2 --
.../accumulo/core/file/blockfile/cache/TestLruBlockCache.java | 2 --
8 files changed, 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8532f075/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/BlockCache.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8532f075/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8532f075/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8532f075/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/ClassSize.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8532f075/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/HeapSize.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8532f075/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/LruBlockCache.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8532f075/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java
----------------------------------------------------------------------
[2/6] accumulo git commit: ACCUMULO-3989 Remove lingering headers
containing copyright year.
Posted by el...@apache.org.
ACCUMULO-3989 Remove lingering headers containing copyright year.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c8697519
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c8697519
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c8697519
Branch: refs/heads/1.7
Commit: c8697519e2bfbcb1752c2293b7593eb308986939
Parents: 25f74cd
Author: Josh Elser <el...@apache.org>
Authored: Sat Oct 3 18:17:06 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sat Oct 3 18:17:06 2015 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/core/file/blockfile/cache/BlockCache.java | 2 --
.../org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java | 2 --
.../accumulo/core/file/blockfile/cache/CachedBlockQueue.java | 2 --
.../org/apache/accumulo/core/file/blockfile/cache/ClassSize.java | 2 --
.../org/apache/accumulo/core/file/blockfile/cache/HeapSize.java | 2 --
.../apache/accumulo/core/file/blockfile/cache/LruBlockCache.java | 2 --
.../accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java | 2 --
.../accumulo/core/file/blockfile/cache/TestLruBlockCache.java | 2 --
8 files changed, 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8697519/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/BlockCache.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/BlockCache.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/BlockCache.java
index a6c08ff..3c9af33 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/BlockCache.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/BlockCache.java
@@ -1,6 +1,4 @@
/*
- * Copyright 2009 The Apache Software Foundation
- *
* 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
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8697519/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java
index b6d6d41..9e99cfb 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java
@@ -1,6 +1,4 @@
/*
- * Copyright 2009 The Apache Software Foundation
- *
* 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
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8697519/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java
index d08fee1..0c35b98 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java
@@ -1,6 +1,4 @@
/*
- * Copyright 2009 The Apache Software Foundation
- *
* 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
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8697519/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/ClassSize.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/ClassSize.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/ClassSize.java
index 2d7586f..f898a8f 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/ClassSize.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/ClassSize.java
@@ -1,6 +1,4 @@
/*
- * Copyright 2009 The Apache Software Foundation
- *
* 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
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8697519/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/HeapSize.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/HeapSize.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/HeapSize.java
index 04db3cd..59e94dd 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/HeapSize.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/HeapSize.java
@@ -1,6 +1,4 @@
/*
- * Copyright 2009 The Apache Software Foundation
- *
* 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
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8697519/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/LruBlockCache.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/LruBlockCache.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/LruBlockCache.java
index 6cab164..cc9d94f 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/LruBlockCache.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/LruBlockCache.java
@@ -1,6 +1,4 @@
/*
- * Copyright 2009 The Apache Software Foundation
- *
* 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
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8697519/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java b/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java
index 940fcf8..e88b4a9 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java
@@ -1,6 +1,4 @@
/*
- * Copyright 2009 The Apache Software Foundation
- *
* 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
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8697519/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java b/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java
index 88d61ac..15abbaf 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java
@@ -1,6 +1,4 @@
/*
- * Copyright 2009 The Apache Software Foundation
- *
* 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
[6/6] accumulo git commit: Merge branch '1.7'
Posted by el...@apache.org.
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/647cfb74
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/647cfb74
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/647cfb74
Branch: refs/heads/master
Commit: 647cfb74f25c8174c8526d8e83fd3fd6c6dac64c
Parents: 5a2396e 8532f07
Author: Josh Elser <el...@apache.org>
Authored: Sat Oct 3 18:17:59 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sat Oct 3 18:17:59 2015 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/core/file/blockfile/cache/BlockCache.java | 2 --
.../org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java | 2 --
.../accumulo/core/file/blockfile/cache/CachedBlockQueue.java | 2 --
.../org/apache/accumulo/core/file/blockfile/cache/ClassSize.java | 2 --
.../org/apache/accumulo/core/file/blockfile/cache/HeapSize.java | 2 --
.../apache/accumulo/core/file/blockfile/cache/LruBlockCache.java | 2 --
.../accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java | 2 --
.../accumulo/core/file/blockfile/cache/TestLruBlockCache.java | 2 --
8 files changed, 16 deletions(-)
----------------------------------------------------------------------
[3/6] accumulo git commit: ACCUMULO-3989 Remove lingering headers
containing copyright year.
Posted by el...@apache.org.
ACCUMULO-3989 Remove lingering headers containing copyright year.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c8697519
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c8697519
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c8697519
Branch: refs/heads/master
Commit: c8697519e2bfbcb1752c2293b7593eb308986939
Parents: 25f74cd
Author: Josh Elser <el...@apache.org>
Authored: Sat Oct 3 18:17:06 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sat Oct 3 18:17:06 2015 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/core/file/blockfile/cache/BlockCache.java | 2 --
.../org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java | 2 --
.../accumulo/core/file/blockfile/cache/CachedBlockQueue.java | 2 --
.../org/apache/accumulo/core/file/blockfile/cache/ClassSize.java | 2 --
.../org/apache/accumulo/core/file/blockfile/cache/HeapSize.java | 2 --
.../apache/accumulo/core/file/blockfile/cache/LruBlockCache.java | 2 --
.../accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java | 2 --
.../accumulo/core/file/blockfile/cache/TestLruBlockCache.java | 2 --
8 files changed, 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8697519/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/BlockCache.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/BlockCache.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/BlockCache.java
index a6c08ff..3c9af33 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/BlockCache.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/BlockCache.java
@@ -1,6 +1,4 @@
/*
- * Copyright 2009 The Apache Software Foundation
- *
* 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
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8697519/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java
index b6d6d41..9e99cfb 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java
@@ -1,6 +1,4 @@
/*
- * Copyright 2009 The Apache Software Foundation
- *
* 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
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8697519/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java
index d08fee1..0c35b98 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java
@@ -1,6 +1,4 @@
/*
- * Copyright 2009 The Apache Software Foundation
- *
* 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
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8697519/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/ClassSize.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/ClassSize.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/ClassSize.java
index 2d7586f..f898a8f 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/ClassSize.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/ClassSize.java
@@ -1,6 +1,4 @@
/*
- * Copyright 2009 The Apache Software Foundation
- *
* 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
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8697519/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/HeapSize.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/HeapSize.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/HeapSize.java
index 04db3cd..59e94dd 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/HeapSize.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/HeapSize.java
@@ -1,6 +1,4 @@
/*
- * Copyright 2009 The Apache Software Foundation
- *
* 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
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8697519/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/LruBlockCache.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/LruBlockCache.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/LruBlockCache.java
index 6cab164..cc9d94f 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/LruBlockCache.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/LruBlockCache.java
@@ -1,6 +1,4 @@
/*
- * Copyright 2009 The Apache Software Foundation
- *
* 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
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8697519/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java b/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java
index 940fcf8..e88b4a9 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java
@@ -1,6 +1,4 @@
/*
- * Copyright 2009 The Apache Software Foundation
- *
* 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
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8697519/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java b/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java
index 88d61ac..15abbaf 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java
@@ -1,6 +1,4 @@
/*
- * Copyright 2009 The Apache Software Foundation
- *
* 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
[5/6] accumulo git commit: Merge branch '1.6' into 1.7
Posted by el...@apache.org.
Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8532f075
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8532f075
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8532f075
Branch: refs/heads/1.7
Commit: 8532f075938d8063364a066950d43dad520b9d66
Parents: 7b5ad53 c869751
Author: Josh Elser <el...@apache.org>
Authored: Sat Oct 3 18:17:52 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sat Oct 3 18:17:52 2015 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/core/file/blockfile/cache/BlockCache.java | 2 --
.../org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java | 2 --
.../accumulo/core/file/blockfile/cache/CachedBlockQueue.java | 2 --
.../org/apache/accumulo/core/file/blockfile/cache/ClassSize.java | 2 --
.../org/apache/accumulo/core/file/blockfile/cache/HeapSize.java | 2 --
.../apache/accumulo/core/file/blockfile/cache/LruBlockCache.java | 2 --
.../accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java | 2 --
.../accumulo/core/file/blockfile/cache/TestLruBlockCache.java | 2 --
8 files changed, 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8532f075/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/BlockCache.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8532f075/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8532f075/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8532f075/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/ClassSize.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8532f075/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/HeapSize.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8532f075/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/LruBlockCache.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8532f075/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java
----------------------------------------------------------------------