You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2014/08/23 00:06:30 UTC

[1/9] git commit: ACCUMULO-3012 Add missing serialVersionUID to new Exception

Repository: accumulo
Updated Branches:
  refs/heads/1.5.2-SNAPSHOT 7136996a1 -> 345332b01
  refs/heads/1.6.1-SNAPSHOT 3f4e7b44f -> 705a60d19
  refs/heads/master 176541991 -> d4d573347


ACCUMULO-3012 Add missing serialVersionUID to new Exception


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

Branch: refs/heads/1.5.2-SNAPSHOT
Commit: 345332b01b3cc33aba0d438b5ae3a8a6b6742ce1
Parents: 7136996
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Aug 22 17:50:49 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Aug 22 17:50:49 2014 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/accumulo/core/conf/ConfigSanityCheck.java | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/345332b0/core/src/main/java/org/apache/accumulo/core/conf/ConfigSanityCheck.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/ConfigSanityCheck.java b/core/src/main/java/org/apache/accumulo/core/conf/ConfigSanityCheck.java
index abec58b..2c7a889 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/ConfigSanityCheck.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/ConfigSanityCheck.java
@@ -102,6 +102,8 @@ public class ConfigSanityCheck {
    * The exception thrown when {@link ConfigSanityCheck#validate(Iterable)} fails.
    */
   public static class SanityCheckException extends RuntimeException {
+    private static final long serialVersionUID = 1L;
+
     /**
      * Creates a new exception with the given message.
      */

[2/9] git commit: ACCUMULO-3012 Add missing serialVersionUID to new Exception

Posted by ct...@apache.org.
ACCUMULO-3012 Add missing serialVersionUID to new Exception


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

Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 345332b01b3cc33aba0d438b5ae3a8a6b6742ce1
Parents: 7136996
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Aug 22 17:50:49 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Aug 22 17:50:49 2014 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/accumulo/core/conf/ConfigSanityCheck.java | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/345332b0/core/src/main/java/org/apache/accumulo/core/conf/ConfigSanityCheck.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/ConfigSanityCheck.java b/core/src/main/java/org/apache/accumulo/core/conf/ConfigSanityCheck.java
index abec58b..2c7a889 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/ConfigSanityCheck.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/ConfigSanityCheck.java
@@ -102,6 +102,8 @@ public class ConfigSanityCheck {
    * The exception thrown when {@link ConfigSanityCheck#validate(Iterable)} fails.
    */
   public static class SanityCheckException extends RuntimeException {
+    private static final long serialVersionUID = 1L;
+
     /**
      * Creates a new exception with the given message.
      */

[9/9] git commit: Merge branch '1.6.1-SNAPSHOT'

Posted by ct...@apache.org.
Merge branch '1.6.1-SNAPSHOT'

  git merge -sours 1.6.1-SNAPSHOT


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

Branch: refs/heads/master
Commit: d4d573347aa5bb8fc31d50f32756370c9fd44b96
Parents: 2b1c026 705a60d
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Aug 22 18:04:16 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Aug 22 18:04:57 2014 -0400

----------------------------------------------------------------------

----------------------------------------------------------------------

[8/9] git commit: ACCUMULO-3019 "Un-deprecate" ServerConfiguration

Posted by ct...@apache.org.
ACCUMULO-3019 "Un-deprecate" ServerConfiguration

  Suppress all the unnecessary warnings noise due to the deprecation of this
  class without removing existing usage. One cannot reasonably consider it
  deprecated if we are still using it so extensively. This only applies to the
  current branch. It is deprecated in future branches. This commit should be
  merged to newer branches with the "ours" merge strategy.


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

Branch: refs/heads/master
Commit: 705a60d19e55c3499c168d3dd3ad5215dd8487c4
Parents: 45d61cb
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Aug 22 18:01:33 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Aug 22 18:01:33 2014 -0400

----------------------------------------------------------------------
 .../org/apache/accumulo/server/conf/ServerConfiguration.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/705a60d1/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java b/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java
index 0793177..50dec57 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java
@@ -25,9 +25,9 @@ import org.apache.accumulo.core.conf.SiteConfiguration;
 import org.apache.accumulo.core.data.KeyExtent;
 
 /**
- * @deprecated Use {@link ServerConfigurationFactory} instead.
+ * Prefer {@link ServerConfigurationFactory} over this class, due to this class being deprecated in future versions with the addition of ACCUMULO-2615. It is
+ * left un-deprecated here, due to the fact that doing so would generate too much churn and noise. See ACCUMULO-3019.
  */
-@Deprecated
 public class ServerConfiguration {
 
   private static SecurityPermission CONFIGURATION_PERMISSION = new SecurityPermission("configurationPermission");
@@ -72,6 +72,7 @@ public class ServerConfiguration {
   static void expireAllTableObservers() {
     ServerConfigurationFactory.expireAllTableObservers();
   }
+
   private final ServerConfigurationFactory scf;
 
   public ServerConfiguration(Instance instance) {

[6/9] git commit: Merge branch '1.6.1-SNAPSHOT'

Posted by ct...@apache.org.
Merge branch '1.6.1-SNAPSHOT'


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

Branch: refs/heads/master
Commit: 2b1c026335791f249f93a6b99a6c33fb3cb38249
Parents: 1765419 45d61cb
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Aug 22 17:56:24 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Aug 22 17:56:24 2014 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/accumulo/core/conf/ConfigSanityCheck.java | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/2b1c0263/core/src/main/java/org/apache/accumulo/core/conf/ConfigSanityCheck.java
----------------------------------------------------------------------

[4/9] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Posted by ct...@apache.org.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT


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

Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 45d61cb3cf282bfdfd66724684bd1c73c7444c1e
Parents: 3f4e7b4 345332b
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Aug 22 17:51:36 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Aug 22 17:51:36 2014 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/accumulo/core/conf/ConfigSanityCheck.java | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/45d61cb3/core/src/main/java/org/apache/accumulo/core/conf/ConfigSanityCheck.java
----------------------------------------------------------------------

[3/9] git commit: ACCUMULO-3012 Add missing serialVersionUID to new Exception

Posted by ct...@apache.org.
ACCUMULO-3012 Add missing serialVersionUID to new Exception


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

Branch: refs/heads/master
Commit: 345332b01b3cc33aba0d438b5ae3a8a6b6742ce1
Parents: 7136996
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Aug 22 17:50:49 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Aug 22 17:50:49 2014 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/accumulo/core/conf/ConfigSanityCheck.java | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/345332b0/core/src/main/java/org/apache/accumulo/core/conf/ConfigSanityCheck.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/ConfigSanityCheck.java b/core/src/main/java/org/apache/accumulo/core/conf/ConfigSanityCheck.java
index abec58b..2c7a889 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/ConfigSanityCheck.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/ConfigSanityCheck.java
@@ -102,6 +102,8 @@ public class ConfigSanityCheck {
    * The exception thrown when {@link ConfigSanityCheck#validate(Iterable)} fails.
    */
   public static class SanityCheckException extends RuntimeException {
+    private static final long serialVersionUID = 1L;
+
     /**
      * Creates a new exception with the given message.
      */

[5/9] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Posted by ct...@apache.org.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT


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

Branch: refs/heads/master
Commit: 45d61cb3cf282bfdfd66724684bd1c73c7444c1e
Parents: 3f4e7b4 345332b
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Aug 22 17:51:36 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Aug 22 17:51:36 2014 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/accumulo/core/conf/ConfigSanityCheck.java | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/45d61cb3/core/src/main/java/org/apache/accumulo/core/conf/ConfigSanityCheck.java
----------------------------------------------------------------------

[7/9] git commit: ACCUMULO-3019 "Un-deprecate" ServerConfiguration

Posted by ct...@apache.org.
ACCUMULO-3019 "Un-deprecate" ServerConfiguration

  Suppress all the unnecessary warnings noise due to the deprecation of this
  class without removing existing usage. One cannot reasonably consider it
  deprecated if we are still using it so extensively. This only applies to the
  current branch. It is deprecated in future branches. This commit should be
  merged to newer branches with the "ours" merge strategy.


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

Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 705a60d19e55c3499c168d3dd3ad5215dd8487c4
Parents: 45d61cb
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Aug 22 18:01:33 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Aug 22 18:01:33 2014 -0400

----------------------------------------------------------------------
 .../org/apache/accumulo/server/conf/ServerConfiguration.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/705a60d1/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java b/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java
index 0793177..50dec57 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java
@@ -25,9 +25,9 @@ import org.apache.accumulo.core.conf.SiteConfiguration;
 import org.apache.accumulo.core.data.KeyExtent;
 
 /**
- * @deprecated Use {@link ServerConfigurationFactory} instead.
+ * Prefer {@link ServerConfigurationFactory} over this class, due to this class being deprecated in future versions with the addition of ACCUMULO-2615. It is
+ * left un-deprecated here, due to the fact that doing so would generate too much churn and noise. See ACCUMULO-3019.
  */
-@Deprecated
 public class ServerConfiguration {
 
   private static SecurityPermission CONFIGURATION_PERMISSION = new SecurityPermission("configurationPermission");
@@ -72,6 +72,7 @@ public class ServerConfiguration {
   static void expireAllTableObservers() {
     ServerConfigurationFactory.expireAllTableObservers();
   }
+
   private final ServerConfigurationFactory scf;
 
   public ServerConfiguration(Instance instance) {