accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Date Mon, 21 Apr 2014 20:10:16 GMT
Merge branch '1.6.0-SNAPSHOT'

Conflicts:
	server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java


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

Branch: refs/heads/master
Commit: 36a97ac019165804c2ce27984c9cc15f854ae874
Parents: 3086472 6ea1ead
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Mon Apr 21 16:10:14 2014 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Mon Apr 21 16:10:14 2014 -0400

----------------------------------------------------------------------
 core/pom.xml                                    |   7 +
 core/src/main/findbugs/exclude-filter.xml       |  36 +++++
 pom.xml                                         |  26 +++-
 proxy/pom.xml                                   |  13 ++
 proxy/src/main/findbugs/exclude-filter.xml      |  21 +++
 .../server/security/SecurityOperation.java      |   8 +-
 .../server/security/SystemCredentials.java      |  51 ++++---
 .../server/security/SystemCredentialsIT.java    | 148 +++++++++++++++++++
 trace/pom.xml                                   |  13 ++
 trace/src/main/findbugs/exclude-filter.xml      |  21 +++
 10 files changed, 313 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/36a97ac0/core/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/36a97ac0/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/36a97ac0/proxy/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/36a97ac0/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/36a97ac0/server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java
----------------------------------------------------------------------
diff --cc server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java
index d99f104,b5d7aba..63528a3
--- a/server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java
@@@ -91,8 -89,9 +90,9 @@@ public final class SystemCredentials ex
      private SystemToken(byte[] systemPassword) {
        super(systemPassword);
      }
-     
-     private static SystemToken get() {
+ 
+     private static SystemToken get(Instance instance) {
 -      byte[] instanceIdBytes = instance.getInstanceID().getBytes(Constants.UTF8);
++      byte[] instanceIdBytes = instance.getInstanceID().getBytes(StandardCharsets.UTF_8);
        byte[] confChecksum;
        MessageDigest md;
        try {
@@@ -100,11 -99,11 +100,11 @@@
        } catch (NoSuchAlgorithmException e) {
          throw new RuntimeException("Failed to compute configuration checksum", e);
        }
-       
+ 
        // seed the config with the version and instance id, so at least it's not empty
 -      md.update(ServerConstants.WIRE_VERSION.toString().getBytes(Constants.UTF8));
 +      md.update(ServerConstants.WIRE_VERSION.toString().getBytes(StandardCharsets.UTF_8));
-       md.update(HdfsZooInstance.getInstance().getInstanceID().getBytes(StandardCharsets.UTF_8));
-       
+       md.update(instanceIdBytes);
+ 
        for (Entry<String,String> entry : ServerConfiguration.getSiteConfiguration())
{
          // only include instance properties
          if (entry.getKey().startsWith(Property.INSTANCE_PREFIX.toString())) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/36a97ac0/trace/pom.xml
----------------------------------------------------------------------


Mime
View raw message