[5/6] accumulo git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' 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/4ac9085d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4ac9085d Diff:

[1/6] accumulo git commit: ACCUMULO-3362 Fix incorrect javadoc for StatsCombiner

Repository: accumulo Updated Branches: refs/heads/1.5 1835c27ca - c41b6dc05 refs/heads/1.6 c5197aaf4 - 4ac9085d4 refs/heads/master ccc9a6788 - bfcb0edb6 ACCUMULO-3362 Fix incorrect javadoc for StatsCombiner Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[2/6] accumulo git commit: ACCUMULO-3362 Fix incorrect javadoc for StatsCombiner

ACCUMULO-3362 Fix incorrect javadoc for StatsCombiner Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c41b6dc0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c41b6dc0 Diff:

[4/6] accumulo git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' 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/4ac9085d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4ac9085d Diff:

[3/6] accumulo git commit: ACCUMULO-3362 Fix incorrect javadoc for StatsCombiner

ACCUMULO-3362 Fix incorrect javadoc for StatsCombiner Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c41b6dc0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c41b6dc0 Diff:

[6/6] accumulo git commit: Merge branch '1.6'

Merge branch '1.6' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bfcb0edb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bfcb0edb Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bfcb0edb

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

Author: drew Date: Mon Nov 24 21:08:53 2014 New Revision: 930344 Log: Publishing svnmucc operation to accumulo site by drew Added: websites/production/accumulo/content/ - copied from r930319, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apidocs/