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/10/06 19:21:16 UTC
[1/3] git commit: ACCUMULO-3203 Remove unused class
Repository: accumulo
Updated Branches:
refs/heads/1.6 44bf5ed2b -> dc2ba1046
refs/heads/master 0bb0012c1 -> fbb7b47c9
ACCUMULO-3203 Remove unused class
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dc2ba104
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dc2ba104
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dc2ba104
Branch: refs/heads/1.6
Commit: dc2ba104669066b0cb35e65d3ded03165c9974fa
Parents: 44bf5ed
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Oct 6 13:19:34 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Oct 6 13:19:34 2014 -0400
----------------------------------------------------------------------
.../SecretKeyEncryptionStrategyContext.java | 31 --------------------
1 file changed, 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/dc2ba104/core/src/main/java/org/apache/accumulo/core/security/crypto/SecretKeyEncryptionStrategyContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/SecretKeyEncryptionStrategyContext.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/SecretKeyEncryptionStrategyContext.java
deleted file mode 100644
index dfe948d..0000000
--- a/core/src/main/java/org/apache/accumulo/core/security/crypto/SecretKeyEncryptionStrategyContext.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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 org.apache.accumulo.core.security.crypto;
-
-import java.util.Map;
-
-public interface SecretKeyEncryptionStrategyContext {
- String getOpaqueKeyEncryptionKeyID();
- void setOpaqueKeyEncryptionKeyID(String id);
- byte[] getPlaintextSecretKey();
- void setPlaintextSecretKey(byte[] key);
- byte[] getEncryptedSecretKey();
- void setEncryptedSecretKey(byte[] key);
- Map<String, String> getContext();
- void setContext(Map<String, String> context);
-}
[3/3] git commit: Merge branch '1.6'
Posted by ct...@apache.org.
Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fbb7b47c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fbb7b47c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fbb7b47c
Branch: refs/heads/master
Commit: fbb7b47c975f6fcc49e4a05fd0e2f45c1be14852
Parents: 0bb0012 dc2ba10
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Oct 6 13:20:04 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Oct 6 13:20:04 2014 -0400
----------------------------------------------------------------------
.../SecretKeyEncryptionStrategyContext.java | 31 --------------------
1 file changed, 31 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: ACCUMULO-3203 Remove unused class
Posted by ct...@apache.org.
ACCUMULO-3203 Remove unused class
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dc2ba104
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dc2ba104
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dc2ba104
Branch: refs/heads/master
Commit: dc2ba104669066b0cb35e65d3ded03165c9974fa
Parents: 44bf5ed
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Oct 6 13:19:34 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Oct 6 13:19:34 2014 -0400
----------------------------------------------------------------------
.../SecretKeyEncryptionStrategyContext.java | 31 --------------------
1 file changed, 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/dc2ba104/core/src/main/java/org/apache/accumulo/core/security/crypto/SecretKeyEncryptionStrategyContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/SecretKeyEncryptionStrategyContext.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/SecretKeyEncryptionStrategyContext.java
deleted file mode 100644
index dfe948d..0000000
--- a/core/src/main/java/org/apache/accumulo/core/security/crypto/SecretKeyEncryptionStrategyContext.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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 org.apache.accumulo.core.security.crypto;
-
-import java.util.Map;
-
-public interface SecretKeyEncryptionStrategyContext {
- String getOpaqueKeyEncryptionKeyID();
- void setOpaqueKeyEncryptionKeyID(String id);
- byte[] getPlaintextSecretKey();
- void setPlaintextSecretKey(byte[] key);
- byte[] getEncryptedSecretKey();
- void setEncryptedSecretKey(byte[] key);
- Map<String, String> getContext();
- void setContext(Map<String, String> context);
-}