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

2013-09-24 Thread elserj
Merge branch '1.5.1-SNAPSHOT' Conflicts: minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ed3c1573 Tree:

[1/2] git commit: ACCUMULO-1733 Add in a better message on minicluster Initialize failure to look at the logs directory.

2013-09-24 Thread elserj
Updated Branches: refs/heads/1.5.1-SNAPSHOT d7448b2ce - 915acf953 ACCUMULO-1733 Add in a better message on minicluster Initialize failure to look at the logs directory. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[1/3] git commit: ACCUMULO-1733 Add in a better message on minicluster Initialize failure to look at the logs directory.

2013-09-24 Thread elserj
Updated Branches: refs/heads/master 3de0c1ec4 - ed3c15737 ACCUMULO-1733 Add in a better message on minicluster Initialize failure to look at the logs directory. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[2/3] git commit: Skip attempt at JAR classpath scan if JAR missing.

2013-09-24 Thread ecn
Skip attempt at JAR classpath scan if JAR missing. Signed-off-by: Eric Newton eric.new...@gmail.com Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/311407e2 Tree:

[1/3] git commit: ACCUMULO-1494 Add support for accumulo jar command.

2013-09-24 Thread ecn
Updated Branches: refs/heads/master ed3c15737 - d99626072 ACCUMULO-1494 Add support for accumulo jar command. Signed-off-by: Eric Newton eric.new...@gmail.com Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

git commit: ACCUMULO-1494 Fix warnings and formatting from patch

2013-09-24 Thread ctubbsii
Updated Branches: refs/heads/master d99626072 - 98fc95216 ACCUMULO-1494 Fix warnings and formatting from patch Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/98fc9521 Tree:

svn commit: r879747 - in /websites/staging/accumulo/trunk/content: ./ source.html

2013-09-24 Thread buildbot
Author: buildbot Date: Tue Sep 24 20:28:36 2013 New Revision: 879747 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/source.html Propchange: websites/staging/accumulo/trunk/content/

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

2013-09-24 Thread ctubbsii
Author: ctubbsii Date: Tue Sep 24 20:29:27 2013 New Revision: 879748 Log: Publishing svnmucc operation to accumulo site by ctubbsii Added: websites/production/accumulo/content/ - copied from r879747, websites/staging/accumulo/trunk/content/

git commit: ACCUMULO-1494 Add missing license header

2013-09-24 Thread ctubbsii
Updated Branches: refs/heads/master 8945f1677 - 583453721 ACCUMULO-1494 Add missing license header Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/58345372 Tree:

[1/5] ACCUMULO-1490 Move html and config docs to monitor

2013-09-24 Thread ctubbsii
Updated Branches: refs/heads/master 583453721 - acba59b16 http://git-wip-us.apache.org/repos/asf/accumulo/blob/acba59b1/server/src/main/resources/docs/metrics.html -- diff --git a/server/src/main/resources/docs/metrics.html