svn commit: r1605806 - /accumulo/site/trunk/content/downloads/index.mdtext

2014-06-26 Thread ctubbsii
Author: ctubbsii Date: Thu Jun 26 14:55:10 2014 New Revision: 1605806 URL: http://svn.apache.org/r1605806 Log: Make downloads page improvements work with Chrome/Safari Modified: accumulo/site/trunk/content/downloads/index.mdtext Modified: accumulo/site/trunk/content/downloads/index.mdtext

svn commit: r913957 - in /websites/staging/accumulo/trunk/content: ./ downloads/index.html

2014-06-26 Thread buildbot
Author: buildbot Date: Thu Jun 26 14:55:22 2014 New Revision: 913957 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/downloads/index.html Propchange:

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

2014-06-26 Thread ctubbsii
Author: ctubbsii Date: Thu Jun 26 15:00:49 2014 New Revision: 913958 Log: Publishing svnmucc operation to accumulo site by ctubbsii Added: websites/production/accumulo/content/ - copied from r913957, websites/staging/accumulo/trunk/content/

svn commit: r1605811 - in /accumulo/site/trunk: content/downloads/index.mdtext templates/nav.html

2014-06-26 Thread ctubbsii
Author: ctubbsii Date: Thu Jun 26 15:09:37 2014 New Revision: 1605811 URL: http://svn.apache.org/r1605811 Log: Fix minor website typos. Modified: accumulo/site/trunk/content/downloads/index.mdtext accumulo/site/trunk/templates/nav.html Modified:

[1/6] git commit: ACCUMULO-2849 Add scanner batch size and write delay configurability to mem stress test

2014-06-26 Thread bhavanki
Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 886cd1981 - f7fe2a847 refs/heads/1.6.1-SNAPSHOT 8bc8d4e4f - 7e34ea923 refs/heads/master 4f139138a - 8253ca05f ACCUMULO-2849 Add scanner batch size and write delay configurability to mem stress test This commit adds one new

[2/6] git commit: ACCUMULO-2849 Add scanner batch size and write delay configurability to mem stress test

2014-06-26 Thread bhavanki
ACCUMULO-2849 Add scanner batch size and write delay configurability to mem stress test This commit adds one new option each to the Scan and Write components of the memory stress test. The --scan-batch-size option for Scan configures the batch size of the scanner it uses, while the

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

2014-06-26 Thread bhavanki
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/7e34ea92 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7e34ea92 Diff:

[3/6] git commit: ACCUMULO-2849 Add scanner batch size and write delay configurability to mem stress test

2014-06-26 Thread bhavanki
ACCUMULO-2849 Add scanner batch size and write delay configurability to mem stress test This commit adds one new option each to the Scan and Write components of the memory stress test. The --scan-batch-size option for Scan configures the batch size of the scanner it uses, while the

[4/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

2014-06-26 Thread bhavanki
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/7e34ea92 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7e34ea92 Diff:

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

2014-06-26 Thread bhavanki
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/8253ca05 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8253ca05 Diff:

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

2014-06-26 Thread ctubbsii
Author: ctubbsii Date: Thu Jun 26 15:09:46 2014 New Revision: 913962 Log: Publishing svnmucc operation to accumulo site by ctubbsii Added: websites/production/accumulo/content/ - copied from r913961, websites/staging/accumulo/trunk/content/

svn commit: r913963 [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-06-26 Thread buildbot
Modified: websites/staging/accumulo/trunk/content/notable_features.html == --- websites/staging/accumulo/trunk/content/notable_features.html (original) +++ websites/staging/accumulo/trunk/content/notable_features.html Thu

[1/2] git commit: ACCUMULO-2827: HeapIterator optimization. Assumes it's more probable that the next entry in a merge comes from the current iterator. Also switching from PriorityBuffer to PriorityQue

2014-06-26 Thread kturner
Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT f7fe2a847 - f8861bf3e ACCUMULO-2827: HeapIterator optimization. Assumes it's more probable that the next entry in a merge comes from the current iterator. Also switching from PriorityBuffer to PriorityQueue to avoid unsafe

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

2014-06-26 Thread kturner
Merge branch '1.5.2-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.2-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f8861bf3 Tree:

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

2014-06-26 Thread kturner
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/f989e4b5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f989e4b5 Diff:

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

2014-06-26 Thread kturner
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/f573a14d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f573a14d Diff:

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

2014-06-26 Thread kturner
Merge branch '1.6.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo 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/045f7b20 Tree:

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

2014-06-26 Thread kturner
Merge branch '1.5.2-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.2-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f8861bf3 Tree:

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

2014-06-26 Thread kturner
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/f989e4b5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f989e4b5 Diff:

[4/8] git commit: Merge branch '1.5.2-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.2-SNAPSHOT

2014-06-26 Thread kturner
Merge branch '1.5.2-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.2-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f8861bf3 Tree:

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

2014-06-26 Thread kturner
Merge branch '1.6.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo 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/045f7b20 Tree:

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

2014-06-26 Thread kturner
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/f573a14d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f573a14d Diff:

[1/5] git commit: ACCUMULO-2827: HeapIterator optimization. Assumes it's more probable that the next entry in a merge comes from the current iterator. Also switching from PriorityBuffer to PriorityQue

2014-06-26 Thread kturner
Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 7e34ea923 - f573a14db ACCUMULO-2827: HeapIterator optimization. Assumes it's more probable that the next entry in a merge comes from the current iterator. Also switching from PriorityBuffer to PriorityQueue to avoid unsafe

[1/8] git commit: ACCUMULO-2827: HeapIterator optimization. Assumes it's more probable that the next entry in a merge comes from the current iterator. Also switching from PriorityBuffer to PriorityQue

2014-06-26 Thread kturner
Repository: accumulo Updated Branches: refs/heads/master 8253ca05f - 67670cdda ACCUMULO-2827: HeapIterator optimization. Assumes it's more probable that the next entry in a merge comes from the current iterator. Also switching from PriorityBuffer to PriorityQueue to avoid unsafe casts

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

2014-06-26 Thread kturner
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/fa71c595 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fa71c595 Diff:

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

2014-06-26 Thread kturner
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/67670cdd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/67670cdd Diff:

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

2014-06-26 Thread kturner
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/32a02b90 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/32a02b90 Diff:

[1/7] git commit: ACCUMULO-2767 Move CV term definition to class-level, add definition to user manual.

2014-06-26 Thread elserj
Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT f8861bf3e - 919975904 refs/heads/1.6.1-SNAPSHOT f573a14db - f506e2c73 refs/heads/master 67670cdda - f9a0d42ad ACCUMULO-2767 Move CV term definition to class-level, add definition to user manual. Project:

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

2014-06-26 Thread elserj
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f506e2c7 Tree:

[3/7] git commit: ACCUMULO-2767 Move CV term definition to class-level, add definition to user manual.

2014-06-26 Thread elserj
ACCUMULO-2767 Move CV term definition to class-level, add definition to user manual. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/91997590 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/91997590 Diff:

[2/7] git commit: ACCUMULO-2767 Move CV term definition to class-level, add definition to user manual.

2014-06-26 Thread elserj
ACCUMULO-2767 Move CV term definition to class-level, add definition to user manual. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/91997590 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/91997590 Diff:

svn commit: r913991 - in /websites/staging/accumulo/trunk/content: ./ governance/releasing.html

2014-06-26 Thread buildbot
Author: buildbot Date: Thu Jun 26 18:57:19 2014 New Revision: 913991 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/governance/releasing.html Propchange:

svn commit: r1605877 - /accumulo/site/trunk/content/governance/releasing.mdtext

2014-06-26 Thread elserj
Author: elserj Date: Thu Jun 26 18:57:08 2014 New Revision: 1605877 URL: http://svn.apache.org/r1605877 Log: CMS commit to accumulo by elserj Modified: accumulo/site/trunk/content/governance/releasing.mdtext Modified: accumulo/site/trunk/content/governance/releasing.mdtext URL:

[2/6] git commit: ACCUMULO-2722 Remove throws Exception which isn't actually thrown.

2014-06-26 Thread elserj
ACCUMULO-2722 Remove throws Exception which isn't actually thrown. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/50baaf17 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/50baaf17 Diff:

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

2014-06-26 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/a4fce6f5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a4fce6f5 Diff:

[4/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

2014-06-26 Thread elserj
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/util/Merge.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9348032f Tree:

[3/6] git commit: ACCUMULO-2722 Remove throws Exception which isn't actually thrown.

2014-06-26 Thread elserj
ACCUMULO-2722 Remove throws Exception which isn't actually thrown. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/50baaf17 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/50baaf17 Diff:

[1/6] git commit: ACCUMULO-2722 Remove throws Exception which isn't actually thrown.

2014-06-26 Thread elserj
Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 919975904 - 50baaf172 refs/heads/1.6.1-SNAPSHOT f506e2c73 - 9348032fe refs/heads/master f9a0d42ad - a4fce6f50 ACCUMULO-2722 Remove throws Exception which isn't actually thrown. Project:

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

2014-06-26 Thread elserj
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/util/Merge.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9348032f Tree:

[7/7] git commit: ACCUMULO-2649 Move the new test class to the new mapreduce module

2014-06-26 Thread elserj
ACCUMULO-2649 Move the new test class to the new mapreduce module Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6e89aae5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6e89aae5 Diff:

[2/7] git commit: ACCUMULO-2649 Get some more tests for the mapred RangeInputSplit

2014-06-26 Thread elserj
ACCUMULO-2649 Get some more tests for the mapred RangeInputSplit Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2422d499 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2422d499 Diff:

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

2014-06-26 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/28f97db1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/28f97db1 Diff:

[1/7] git commit: ACCUMULO-2649 Get some more tests for the mapred RangeInputSplit

2014-06-26 Thread elserj
Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 50baaf172 - 2422d4997 refs/heads/1.6.1-SNAPSHOT 9348032fe - 934ca6fd4 refs/heads/master a4fce6f50 - 6e89aae58 ACCUMULO-2649 Get some more tests for the mapred RangeInputSplit Project:

[3/7] git commit: ACCUMULO-2649 Get some more tests for the mapred RangeInputSplit

2014-06-26 Thread elserj
ACCUMULO-2649 Get some more tests for the mapred RangeInputSplit Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2422d499 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2422d499 Diff:

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

2014-06-26 Thread elserj
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormatTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/934ca6fd

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

2014-06-26 Thread elserj
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormatTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/934ca6fd

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

2014-06-26 Thread bhavanki
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/ab6ea922 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ab6ea922 Diff:

[4/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

2014-06-26 Thread bhavanki
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: test/system/stress/README.md Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2a17a7a2 Tree:

[1/6] git commit: ACCUMULO-2850 Add enhanced memory stress test scripts

2014-06-26 Thread bhavanki
Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 2422d4997 - e01a72062 refs/heads/1.6.1-SNAPSHOT 934ca6fd4 - 2a17a7a2b refs/heads/master 6e89aae58 - ab6ea922f ACCUMULO-2850 Add enhanced memory stress test scripts New scripts for the memory stress test make it easy to start

[2/6] git commit: ACCUMULO-2850 Add enhanced memory stress test scripts

2014-06-26 Thread bhavanki
ACCUMULO-2850 Add enhanced memory stress test scripts New scripts for the memory stress test make it easy to start and stop multiple reader and writer processes, in a manner similar to continuous ingest. See the updated README.md for information on how the scripts are used. Project:

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

2014-06-26 Thread bhavanki
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: test/system/stress/README.md Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2a17a7a2 Tree:

[3/6] git commit: ACCUMULO-2850 Add enhanced memory stress test scripts

2014-06-26 Thread bhavanki
ACCUMULO-2850 Add enhanced memory stress test scripts New scripts for the memory stress test make it easy to start and stop multiple reader and writer processes, in a manner similar to continuous ingest. See the updated README.md for information on how the scripts are used. Project:

[1/6] git commit: ACCUMULO-2658 Don't read more than the configured maximum amount of data for the proxy thrift server

2014-06-26 Thread elserj
Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT e01a72062 - 727bbf713 refs/heads/1.6.1-SNAPSHOT 2a17a7a2b - c8b788189 refs/heads/master ab6ea922f - f295f8fe5 ACCUMULO-2658 Don't read more than the configured maximum amount of data for the proxy thrift server Project:

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

2014-06-26 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/c8b78818 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c8b78818 Diff:

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

2014-06-26 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/f295f8fe Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f295f8fe Diff:

[3/6] git commit: ACCUMULO-2658 Don't read more than the configured maximum amount of data for the proxy thrift server

2014-06-26 Thread elserj
ACCUMULO-2658 Don't read more than the configured maximum amount of data for the proxy thrift server Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/727bbf71 Tree:

[4/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

2014-06-26 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/c8b78818 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c8b78818 Diff:

[2/6] git commit: ACCUMULO-2658 Don't read more than the configured maximum amount of data for the proxy thrift server

2014-06-26 Thread elserj
ACCUMULO-2658 Don't read more than the configured maximum amount of data for the proxy thrift server Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/727bbf71 Tree:

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

2014-06-26 Thread ctubbsii
Merge branch '1.6.1-SNAPSHOT' Conflicts: conf/examples/1GB/standalone/log4j.properties conf/examples/2GB/native-standalone/log4j.properties conf/examples/2GB/standalone/log4j.properties conf/examples/3GB/native-standalone/log4j.properties