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:
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:
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:
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:
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:
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:
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/
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/
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:
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
10 matches
Mail list logo