[4/8] Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

2014-09-10 Thread elserj
http://git-wip-us.apache.org/repos/asf/accumulo/blob/560c2688/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java -- diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java index

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

2014-09-10 Thread elserj
Merge branch '1.6.1-SNAPSHOT' Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6104c98b Tree: http://git-wip-us.apache.org/re

[3/8] git commit: ACCUMULO-3106 Improve the warning message about gc pauses

2014-09-10 Thread elserj
ACCUMULO-3106 Improve the warning message about gc pauses Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c335fca7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c335fca7 Diff: http://git-wip-us.apache.org/re

[1/8] git commit: ACCUMULO-3106 Improve the warning message about gc pauses

2014-09-10 Thread elserj
Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 0a5ceca53 -> c335fca72 refs/heads/1.6.1-SNAPSHOT a9ea7a990 -> 560c26882 refs/heads/master 32f27693f -> 6104c98b9 ACCUMULO-3106 Improve the warning message about gc pauses Project: http://git-wip-us.apache.org/repos/asf/accum

[6/8] Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

2014-09-10 Thread elserj
http://git-wip-us.apache.org/repos/asf/accumulo/blob/560c2688/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java -- diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java index

[2/8] git commit: ACCUMULO-3106 Improve the warning message about gc pauses

2014-09-10 Thread elserj
ACCUMULO-3106 Improve the warning message about gc pauses Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c335fca7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c335fca7 Diff: http://git-wip-us.apache.org/re

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

2014-09-10 Thread elserj
Merge branch '1.5.2-SNAPSHOT' into 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/560c2688 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/560c2688 Diff: http://git-wip-us.apache.org/repos/asf/

[7/8] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

2014-09-10 Thread elserj
Merge branch '1.5.2-SNAPSHOT' into 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/560c2688 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/560c2688 Diff: http://git-wip-us.apache.org/repos/asf/

[1/3] git commit: Revert "ACCUMULO-3110 ACCUMULO-3108 Fix defaultTimeoutSeconds to be class-level, not method-level"

2014-09-10 Thread elserj
Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT c566e931b -> a9ea7a990 refs/heads/master fa10a3143 -> 32f27693f Revert "ACCUMULO-3110 ACCUMULO-3108 Fix defaultTimeoutSeconds to be class-level, not method-level" This reverts commit c566e931b2bad8cb7667b4f8e67992e2a5f9a060.

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

2014-09-10 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/32f27693 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/32f27693 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/32f276

[2/3] git commit: Revert "ACCUMULO-3110 ACCUMULO-3108 Fix defaultTimeoutSeconds to be class-level, not method-level"

2014-09-10 Thread elserj
Revert "ACCUMULO-3110 ACCUMULO-3108 Fix defaultTimeoutSeconds to be class-level, not method-level" This reverts commit c566e931b2bad8cb7667b4f8e67992e2a5f9a060. Timeout rule *is* applied per method in a class, not the sum of all methods in the class. Project: http://git-wip-us.apache.org/repo

[1/3] git commit: ACCUMULO-3110 ACCUMULO-3108 Fix defaultTimeoutSeconds to be class-level, not method-level

2014-09-10 Thread elserj
Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 4d2a73def -> c566e931b refs/heads/master de3dcc2da -> fa10a3143 ACCUMULO-3110 ACCUMULO-3108 Fix defaultTimeoutSeconds to be class-level, not method-level Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: h

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

2014-09-10 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/fa10a314 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fa10a314 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fa10a3

[2/3] git commit: ACCUMULO-3110 ACCUMULO-3108 Fix defaultTimeoutSeconds to be class-level, not method-level

2014-09-10 Thread elserj
ACCUMULO-3110 ACCUMULO-3108 Fix defaultTimeoutSeconds to be class-level, not method-level Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c566e931 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c566e931 Diff

[2/3] git commit: ACCUMULO-3110 clean up some more timeout related issues with some problematic ITs

2014-09-10 Thread elserj
ACCUMULO-3110 clean up some more timeout related issues with some problematic ITs Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4d2a73de Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4d2a73de Diff: http:/

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

2014-09-10 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/de3dcc2d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/de3dcc2d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/de3dcc

[1/3] git commit: ACCUMULO-3110 clean up some more timeout related issues with some problematic ITs

2014-09-10 Thread elserj
Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 32840695f -> 4d2a73def refs/heads/master 464f73675 -> de3dcc2da ACCUMULO-3110 clean up some more timeout related issues with some problematic ITs Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://gi

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

2014-09-10 Thread elserj
Author: elserj Date: Thu Sep 11 00:42:17 2014 New Revision: 921815 Log: Publishing svnmucc operation to accumulo site by elserj Added: websites/production/accumulo/content/ - copied from r921814, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apido

svn commit: r1624176 - /accumulo/site/trunk/content/git.mdtext

2014-09-10 Thread elserj
Author: elserj Date: Thu Sep 11 00:41:53 2014 New Revision: 1624176 URL: http://svn.apache.org/r1624176 Log: CMS commit to accumulo by elserj Modified: accumulo/site/trunk/content/git.mdtext Modified: accumulo/site/trunk/content/git.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/tru

svn commit: r921814 - in /websites/staging/accumulo/trunk/content: ./ git.html

2014-09-10 Thread buildbot
Author: buildbot Date: Thu Sep 11 00:41:59 2014 New Revision: 921814 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/git.html Propchange: websites/staging/accumulo/trunk/content/ ---

svn commit: r921813 - in /websites/staging/accumulo/trunk/content: ./ git.html

2014-09-10 Thread buildbot
Author: buildbot Date: Thu Sep 11 00:41:19 2014 New Revision: 921813 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/git.html Propchange: websites/staging/accumulo/trunk/content/ ---

svn commit: r1624175 - /accumulo/site/trunk/content/git.mdtext

2014-09-10 Thread elserj
Author: elserj Date: Thu Sep 11 00:41:13 2014 New Revision: 1624175 URL: http://svn.apache.org/r1624175 Log: Add message about not signoff'ing pull-requests. Update some formatting Modified: accumulo/site/trunk/content/git.mdtext Modified: accumulo/site/trunk/content/git.mdtext URL: http://

svn commit: r921812 [1/2] - in /websites/staging/accumulo/trunk/content: ./ 1.4/examples/ 1.4/user_manual/ 1.5/examples/ 1.6/examples/ downloads/ example/ governance/ release_notes/ user_manual_1.3-in

2014-09-10 Thread buildbot
Author: buildbot Date: Thu Sep 11 00:37:17 2014 New Revision: 921812 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/1.4/examples/batch.html websites/staging/accumulo/trunk/conten

svn commit: r921812 [2/2] - in /websites/staging/accumulo/trunk/content: ./ 1.4/examples/ 1.4/user_manual/ 1.5/examples/ 1.6/examples/ downloads/ example/ governance/ release_notes/ user_manual_1.3-in

2014-09-10 Thread buildbot
Modified: websites/staging/accumulo/trunk/content/user_manual_1.3-incubating/High_Speed_Ingest.html == --- websites/staging/accumulo/trunk/content/user_manual_1.3-incubating/High_Speed_Ingest.html (original) +++ website

svn commit: r1624173 - /accumulo/site/trunk/templates/nav.html

2014-09-10 Thread elserj
Author: elserj Date: Thu Sep 11 00:36:47 2014 New Revision: 1624173 URL: http://svn.apache.org/r1624173 Log: Update nav menu to remove WIP Modified: accumulo/site/trunk/templates/nav.html Modified: accumulo/site/trunk/templates/nav.html URL: http://svn.apache.org/viewvc/accumulo/site/trunk/

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

2014-09-10 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/464f7367 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/464f7367 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/464f73

[2/3] git commit: ACCUMULO-3109 Stabilize MonitorLoggingIT some more

2014-09-10 Thread elserj
ACCUMULO-3109 Stabilize MonitorLoggingIT some more We only need one tserver (reduce ZK watchers to fire), remove the timeout attribute so timeout.factor works, and sleep before we cause the error so the tserver is likely to have seen the updated log-fwding addr. Project: http://git-wip-us.apache

[1/3] git commit: ACCUMULO-3109 Stabilize MonitorLoggingIT some more

2014-09-10 Thread elserj
Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 5c8ac744e -> 32840695f refs/heads/master e7b877360 -> 464f73675 ACCUMULO-3109 Stabilize MonitorLoggingIT some more We only need one tserver (reduce ZK watchers to fire), remove the timeout attribute so timeout.factor works, and

[2/3] git commit: ACCUMULO-3108 Remove timeout attribute to allow timeout.factor to be used.

2014-09-10 Thread elserj
ACCUMULO-3108 Remove timeout attribute to allow timeout.factor to be used. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5c8ac744 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5c8ac744 Diff: http://git-wip

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

2014-09-10 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/e7b87736 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e7b87736 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e7b877

[1/3] git commit: ACCUMULO-3108 Remove timeout attribute to allow timeout.factor to be used.

2014-09-10 Thread elserj
Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 5be05eb7f -> 5c8ac744e refs/heads/master 72f09f7c5 -> e7b877360 ACCUMULO-3108 Remove timeout attribute to allow timeout.factor to be used. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us