Author: vines
Date: Thu Feb 28 19:48:06 2013
New Revision: 1451315
URL: http://svn.apache.org/r1451315
Log:
ACCUMULO-259 - merging 1.5 up to polishing branch
Modified:
accumulo/branches/ACCUMULO-259-polishing/ (props changed)
accumulo/branches/ACCUMULO-259-polishing/core/ (props changed)
accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/security/thrift/AuthInfo.java
accumulo/branches/ACCUMULO-259-polishing/core/src/main/thrift/security.thrift
Propchange: accumulo/branches/ACCUMULO-259-polishing/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1451053-1451248
Propchange: accumulo/branches/ACCUMULO-259-polishing/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1451019-1451248
Modified:
accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/security/thrift/AuthInfo.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/security/thrift/AuthInfo.java?rev=1451315&r1=1451314&r2=1451315&view=diff
==============================================================================
---
accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/security/thrift/AuthInfo.java
(original)
+++
accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/security/thrift/AuthInfo.java
Thu Feb 28 19:48:06 2013
@@ -46,6 +46,10 @@ import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ * * @Deprecated since 1.5
+ * *
+ */
@SuppressWarnings("all") public class AuthInfo implements
org.apache.thrift.TBase<AuthInfo, AuthInfo._Fields>, java.io.Serializable,
Cloneable {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new
org.apache.thrift.protocol.TStruct("AuthInfo");
Modified:
accumulo/branches/ACCUMULO-259-polishing/core/src/main/thrift/security.thrift
URL:
http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/main/thrift/security.thrift?rev=1451315&r1=1451314&r2=1451315&view=diff
==============================================================================
---
accumulo/branches/ACCUMULO-259-polishing/core/src/main/thrift/security.thrift
(original)
+++
accumulo/branches/ACCUMULO-259-polishing/core/src/main/thrift/security.thrift
Thu Feb 28 19:48:06 2013
@@ -38,7 +38,9 @@ enum SecurityErrorCode {
INSUFFICIENT_PROPERTIES = 17;
}
-/* deprecated */
+/**
+ * @Deprecated since 1.5
+**/
struct AuthInfo {
1:string user,
2:binary password,
