[1/2] git commit: ACCUMULO-3193 use a thread pool to jam more requests into the NN, which will hopefully compete better with the other NN requests

2014-10-03 Thread ecn
Repository: accumulo Updated Branches: refs/heads/master c9eaa7ff1 -> c217a7d60 ACCUMULO-3193 use a thread pool to jam more requests into the NN, which will hopefully compete better with the other NN requests Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wi

[2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo

2014-10-03 Thread ecn
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c217a7d6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c217a7d6 Diff: http://git-wip-

[2/5] git commit: ACCUMULO-3183 support loading compaction strategy from per table classpath

2014-10-03 Thread kturner
ACCUMULO-3183 support loading compaction strategy from per table classpath Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/43f787d6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/43f787d6 Diff: http://git-wip

[3/5] git commit: ACCUMULO-3189 add verification of compaction plan

2014-10-03 Thread kturner
ACCUMULO-3189 add verification of compaction plan Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9c4967e8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9c4967e8 Diff: http://git-wip-us.apache.org/repos/asf/

[1/5] git commit: Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6

2014-10-03 Thread kturner
Repository: accumulo Updated Branches: refs/heads/master 29ca17769 -> c9eaa7ff1 Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a65f1234

[5/5] git commit: Merge branch '1.6'

2014-10-03 Thread kturner
Merge branch '1.6' Conflicts: core/src/main/java/org/apache/accumulo/core/conf/Property.java server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/a

[4/5] Merge branch '1.6'

2014-10-03 Thread kturner
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c9eaa7ff/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java -- diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java ind

[2/2] git commit: ACCUMULO-3189 add verification of compaction plan

2014-10-03 Thread kturner
ACCUMULO-3189 add verification of compaction plan Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9c4967e8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9c4967e8 Diff: http://git-wip-us.apache.org/repos/asf/

[1/2] git commit: ACCUMULO-3183 support loading compaction strategy from per table classpath

2014-10-03 Thread kturner
Repository: accumulo Updated Branches: refs/heads/1.6 a65f1234e -> 9c4967e8f ACCUMULO-3183 support loading compaction strategy from per table classpath Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/43f787d6 Tree: h

svn commit: r924533 - in /websites/production/accumulo/content: ./ 1.4/apidocs/ 1.5/apidocs/ 1.6/apidocs/

2014-10-03 Thread elserj
Author: elserj Date: Fri Oct 3 16:25:12 2014 New Revision: 924533 Log: Publishing svnmucc operation to accumulo site by elserj Added: websites/production/accumulo/content/ - copied from r924532, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apido

svn commit: r1629249 - /accumulo/site/trunk/content/1.6/accumulo_user_manual.html

2014-10-03 Thread elserj
Author: elserj Date: Fri Oct 3 16:22:41 2014 New Revision: 1629249 URL: http://svn.apache.org/r1629249 Log: ACCUMULO-3142 Hand-edit latex changes into asciidoc-generated HTML user manual Modified: accumulo/site/trunk/content/1.6/accumulo_user_manual.html Modified: accumulo/site/trunk/conten

svn commit: r924532 - in /websites/staging/accumulo/trunk/content: ./ 1.6/accumulo_user_manual.html

2014-10-03 Thread buildbot
Author: buildbot Date: Fri Oct 3 16:22:57 2014 New Revision: 924532 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/1.6/accumulo_user_manual.html Propchange: websites/staging/accumu

git commit: ACCUMULO-3182 Fix incorrect fix at bad merge.

2014-10-03 Thread elserj
Repository: accumulo Updated Branches: refs/heads/master dc0d01ce8 -> 29ca17769 ACCUMULO-3182 Fix incorrect fix at bad merge. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/29ca1776 Tree: http://git-wip-us.apache.or