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/05/26 21:30:32 UTC

[1/6] accumulo git commit: ACCUMULO-3837 Fix findbugs issue

Repository: accumulo
Updated Branches:
  refs/heads/1.6 99aa9a965 -> 259032205
  refs/heads/1.7 5320861a8 -> 829f46d06
  refs/heads/master 56e211ae6 -> 0138249ca


ACCUMULO-3837 Fix findbugs issue

AtomicReference should be final


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/25903220
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/25903220
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/25903220

Branch: refs/heads/1.6
Commit: 2590322050b2bb1077cab6f92d59eef84dc72e4d
Parents: 99aa9a9
Author: Josh Elser <el...@apache.org>
Authored: Tue May 26 15:29:40 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue May 26 15:29:40 2015 -0400

----------------------------------------------------------------------
 .../monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/25903220/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 0113fb6..ecc5ece 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -171,7 +171,7 @@ public class Monitor {
   private ZooLock monitorLock;
 
   private static final String DEFAULT_INSTANCE_NAME = "(Unavailable)";
-  public static AtomicReference<String> cachedInstanceName = new AtomicReference<String>(DEFAULT_INSTANCE_NAME);
+  public static final AtomicReference<String> cachedInstanceName = new AtomicReference<String>(DEFAULT_INSTANCE_NAME);
 
   private static class EventCounter {
 


[2/6] accumulo git commit: ACCUMULO-3837 Fix findbugs issue

Posted by el...@apache.org.
ACCUMULO-3837 Fix findbugs issue

AtomicReference should be final


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/25903220
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/25903220
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/25903220

Branch: refs/heads/1.7
Commit: 2590322050b2bb1077cab6f92d59eef84dc72e4d
Parents: 99aa9a9
Author: Josh Elser <el...@apache.org>
Authored: Tue May 26 15:29:40 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue May 26 15:29:40 2015 -0400

----------------------------------------------------------------------
 .../monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/25903220/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 0113fb6..ecc5ece 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -171,7 +171,7 @@ public class Monitor {
   private ZooLock monitorLock;
 
   private static final String DEFAULT_INSTANCE_NAME = "(Unavailable)";
-  public static AtomicReference<String> cachedInstanceName = new AtomicReference<String>(DEFAULT_INSTANCE_NAME);
+  public static final AtomicReference<String> cachedInstanceName = new AtomicReference<String>(DEFAULT_INSTANCE_NAME);
 
   private static class EventCounter {
 


[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/829f46d0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/829f46d0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/829f46d0

Branch: refs/heads/1.7
Commit: 829f46d06feff2ce967ee28180d427a60eafb508
Parents: 5320861 2590322
Author: Josh Elser <el...@apache.org>
Authored: Tue May 26 15:30:02 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue May 26 15:30:02 2015 -0400

----------------------------------------------------------------------
 .../monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/829f46d0/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------


[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/0138249c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0138249c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0138249c

Branch: refs/heads/master
Commit: 0138249ca9d83d401c6ab4bd6906a25a48a8a98f
Parents: 56e211a 829f46d
Author: Josh Elser <el...@apache.org>
Authored: Tue May 26 15:30:07 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue May 26 15:30:07 2015 -0400

----------------------------------------------------------------------
 .../monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------



[3/6] accumulo git commit: ACCUMULO-3837 Fix findbugs issue

Posted by el...@apache.org.
ACCUMULO-3837 Fix findbugs issue

AtomicReference should be final


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/25903220
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/25903220
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/25903220

Branch: refs/heads/master
Commit: 2590322050b2bb1077cab6f92d59eef84dc72e4d
Parents: 99aa9a9
Author: Josh Elser <el...@apache.org>
Authored: Tue May 26 15:29:40 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue May 26 15:29:40 2015 -0400

----------------------------------------------------------------------
 .../monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/25903220/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 0113fb6..ecc5ece 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -171,7 +171,7 @@ public class Monitor {
   private ZooLock monitorLock;
 
   private static final String DEFAULT_INSTANCE_NAME = "(Unavailable)";
-  public static AtomicReference<String> cachedInstanceName = new AtomicReference<String>(DEFAULT_INSTANCE_NAME);
+  public static final AtomicReference<String> cachedInstanceName = new AtomicReference<String>(DEFAULT_INSTANCE_NAME);
 
   private static class EventCounter {
 


[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/829f46d0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/829f46d0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/829f46d0

Branch: refs/heads/master
Commit: 829f46d06feff2ce967ee28180d427a60eafb508
Parents: 5320861 2590322
Author: Josh Elser <el...@apache.org>
Authored: Tue May 26 15:30:02 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue May 26 15:30:02 2015 -0400

----------------------------------------------------------------------
 .../monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/829f46d0/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------