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

2014-08-06 Thread elserj
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/4bb28faa Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4bb28faa Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4bb28f

[2/3] git commit: ACCUMULO-3052 Allow configuration of SSL cipher suites

2014-08-06 Thread elserj
ACCUMULO-3052 Allow configuration of SSL cipher suites Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/20aecf7d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/20aecf7d Diff: http://git-wip-us.apache.org/repos

[1/3] git commit: ACCUMULO-3052 Allow configuration of SSL cipher suites

2014-08-06 Thread elserj
Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT cc30021c2 -> 20aecf7d6 refs/heads/master dbcf984b2 -> 4bb28faaf ACCUMULO-3052 Allow configuration of SSL cipher suites Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/as

[1/5] git commit: ACCUMULO-3050 Include client IP from thrift processor in audit msg

2014-08-06 Thread elserj
Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 81a77e1d6 -> cc30021c2 refs/heads/master 7c047e145 -> dbcf984b2 ACCUMULO-3050 Include client IP from thrift processor in audit msg Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.

[3/5] git commit: ACCUMULO-3050 Include client IP from thrift processor in audit msg

2014-08-06 Thread elserj
ACCUMULO-3050 Include client IP from thrift processor in audit msg Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cc30021c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cc30021c Diff: http://git-wip-us.apac

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

2014-08-06 Thread elserj
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/dbcf984b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dbcf984b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dbcf98

[4/5] git commit: ACCUMULO-3049 Add authenticate to AuditedSecurityOperation

2014-08-06 Thread elserj
ACCUMULO-3049 Add authenticate to AuditedSecurityOperation When a client authenticates with Accumulo, the information is presently not included in the audit log. We should definitely know when a client is authenticating against the system. Project: http://git-wip-us.apache.org/repos/asf/accumulo

[2/5] git commit: ACCUMULO-3049 Add authenticate to AuditedSecurityOperation

2014-08-06 Thread elserj
ACCUMULO-3049 Add authenticate to AuditedSecurityOperation When a client authenticates with Accumulo, the information is presently not included in the audit log. We should definitely know when a client is authenticating against the system. Project: http://git-wip-us.apache.org/repos/asf/accumulo

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

2014-08-06 Thread ecn
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/7c047e14 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7c047e14 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7c047e

[1/2] git commit: ACCUMULO-3047 delete entries created by deleterows were incorrectly de-relativized

2014-08-06 Thread ecn
Repository: accumulo Updated Branches: refs/heads/master aca57d3fb -> 7c047e145 ACCUMULO-3047 delete entries created by deleterows were incorrectly de-relativized Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/81a7

git commit: ACCUMULO-3047 delete entries created by deleterows were incorrectly de-relativized

2014-08-06 Thread ecn
Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT b54df7817 -> 81a77e1d6 ACCUMULO-3047 delete entries created by deleterows were incorrectly de-relativized Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/com

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

2014-08-06 Thread elserj
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/aca57d3f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/aca57d3f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/aca57d

[2/6] git commit: ACCUMULO-3048 Update CHANGES for 1.5.2

2014-08-06 Thread elserj
ACCUMULO-3048 Update CHANGES for 1.5.2 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/139bd83c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/139bd83c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/di

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

2014-08-06 Thread elserj
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: CHANGES Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b54df781 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b54df781 Diff: http://git-

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

2014-08-06 Thread elserj
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: CHANGES Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b54df781 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b54df781 Diff: http://git-

[3/6] git commit: ACCUMULO-3048 Update CHANGES for 1.5.2

2014-08-06 Thread elserj
ACCUMULO-3048 Update CHANGES for 1.5.2 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/139bd83c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/139bd83c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/di

[1/6] git commit: ACCUMULO-3048 Update CHANGES for 1.5.2

2014-08-06 Thread elserj
Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 6bbe12165 -> 139bd83cf refs/heads/1.6.1-SNAPSHOT 4f082cf34 -> b54df7817 refs/heads/master 186bc13f8 -> aca57d3fb ACCUMULO-3048 Update CHANGES for 1.5.2 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: ht