accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [3/3] accumulo git commit: Merge branch '1.6'
Date Sat, 08 Nov 2014 00:19:44 GMT
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/7e0121d1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7e0121d1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7e0121d1

Branch: refs/heads/master
Commit: 7e0121d11dd7413161d101b8cd5df0fca8b614a7
Parents: 566839e 520d802
Author: Josh Elser <elserj@apache.org>
Authored: Fri Nov 7 19:19:20 2014 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Fri Nov 7 19:19:20 2014 -0500

----------------------------------------------------------------------
 .../org/apache/accumulo/core/conf/Property.java |   5 +
 .../accumulo/core/util/SslConnectionParams.java | 104 +++++++---
 .../apache/accumulo/core/util/ThriftUtil.java   | 200 ++++++++++++++++++-
 .../org/apache/accumulo/server/Accumulo.java    |   2 +-
 4 files changed, 282 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7e0121d1/core/src/main/java/org/apache/accumulo/core/conf/Property.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7e0121d1/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7e0121d1/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
----------------------------------------------------------------------


Mime
View raw message