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

Merge branch '1.6.0-SNAPSHOT' Conflicts: core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5655a044 Tree: http://git-wip-us.apache.org/re

[1/6] ACCUMULO-1487, ACCUMULO-1491 Stop packaging docs for monitor

Repository: accumulo Updated Branches: refs/heads/master 0721f8dca -> 5655a044e http://git-wip-us.apache.org/repos/asf/accumulo/blob/a20e19fc/server/monitor/src/main/resources/docs/isolation.html -- diff --git a/server/monitor/

[1/5] ACCUMULO-1487, ACCUMULO-1491 Stop packaging docs for monitor

Repository: accumulo Updated Branches: refs/heads/1.6.0-SNAPSHOT 042812287 -> a20e19fc4 http://git-wip-us.apache.org/repos/asf/accumulo/blob/a20e19fc/server/monitor/src/main/resources/docs/isolation.html -- diff --git a/server/

[1/3] git commit: ACCUMULO-2541 Set seekSleepTime and not (next)sleepTime in ScannerIT

Repository: accumulo Updated Branches: refs/heads/1.6.0-SNAPSHOT 6430933a7 -> 042812287 refs/heads/master 904023ae2 -> 0721f8dca ACCUMULO-2541 Set seekSleepTime and not (next)sleepTime in ScannerIT Setting a batchSize of 1 will cause a new ScanSession for each k/v returned. This means that n

[2/3] git commit: ACCUMULO-2541 Set seekSleepTime and not (next)sleepTime in ScannerIT

ACCUMULO-2541 Set seekSleepTime and not (next)sleepTime in ScannerIT Setting a batchSize of 1 will cause a new ScanSession for each k/v returned. This means that next() will never be called on SlowIterator and thus the intended effect of waiting server side doesn't actually happen. Project: http

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

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0721f8dc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0721f8dc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0721f8

[02/10] git commit: ACCUMULO-2433 Can't reliably assume we won't get stale data with >1 tserver in test.

ACCUMULO-2433 Can't reliably assume we won't get stale data with >1 tserver in test. Add some retries to make sure we don't get stale data from ZooCache if we happen to talk to the other MAC tserver. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache

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

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/5b479243 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5

[08/10] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: test/src/test/java/org/apache/accumulo/test/ShellServerTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6430933a Tree: http://git-wip-us.apac

[06/10] git commit: ACCUMULO-2433 More test retries if at first we don't succeed.

ACCUMULO-2433 More test retries if at first we don't succeed. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dfbce9bc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dfbce9bc Diff: http://git-wip-us.apache.or

[01/10] git commit: ACCUMULO-2433 Can't reliably assume we won't get stale data with >1 tserver in test.

Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 334f7a724 -> 5b4792431 refs/heads/1.6.0-SNAPSHOT d3bd456e7 -> 6430933a7 refs/heads/master 4cfde769c -> 904023ae2 ACCUMULO-2433 Can't reliably assume we won't get stale data with >1 tserver in test. Add some retries to make s

[04/10] git commit: ACCUMULO-2433 More test retries if at first we don't succeed.

ACCUMULO-2433 More test retries if at first we don't succeed. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dfbce9bc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dfbce9bc Diff: http://git-wip-us.apache.or

[07/10] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: test/src/test/java/org/apache/accumulo/test/ShellServerTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6430933a Tree: http://git-wip-us.apac

[09/10] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[03/10] git commit: ACCUMULO-2433 Can't reliably assume we won't get stale data with >1 tserver in test.

ACCUMULO-2433 Can't reliably assume we won't get stale data with >1 tserver in test. Add some retries to make sure we don't get stale data from ZooCache if we happen to talk to the other MAC tserver. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache

[05/10] git commit: ACCUMULO-2433 More test retries if at first we don't succeed.

ACCUMULO-2433 More test retries if at first we don't succeed. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dfbce9bc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dfbce9bc Diff: http://git-wip-us.apache.or

[05/11] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' 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/334f7a72 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/334f7a72 Diff: http://git-wip-us.apache.org/repos/asf/

[07/11] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' 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/334f7a72 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/334f7a72 Diff: http://git-wip-us.apache.org/repos/asf/

[03/11] git commit: ACCUMULO-2524 Check for null args to ProblemReport constructors

ACCUMULO-2524 Check for null args to ProblemReport constructors Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1258b4e0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1258b4e0 Diff: http://git-wip-us.apache.

[11/11] git commit: ACCUMULO-2524 Update ProblemReport to use Preconditions over ArgumentChecker

ACCUMULO-2524 Update ProblemReport to use Preconditions over ArgumentChecker Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4cfde769 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4cfde769 Diff: http://git-w

[08/11] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d3bd456e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d3bd456e Diff: http://git-wip-us.apache.org/repos/asf/

[01/11] git commit: ACCUMULO-2524 Check for null args to ProblemReport constructors

Repository: accumulo Updated Branches: refs/heads/1.4.5-SNAPSHOT 461910148 -> 1258b4e03 refs/heads/1.5.2-SNAPSHOT 4a05a17de -> 334f7a724 refs/heads/1.6.0-SNAPSHOT 3ce0bfda3 -> d3bd456e7 refs/heads/master 3c935b129 -> 4cfde769c ACCUMULO-2524 Check for null args to ProblemReport constructor

[06/11] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' 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/334f7a72 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/334f7a72 Diff: http://git-wip-us.apache.org/repos/asf/

[02/11] git commit: ACCUMULO-2524 Check for null args to ProblemReport constructors

ACCUMULO-2524 Check for null args to ProblemReport constructors Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1258b4e0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1258b4e0 Diff: http://git-wip-us.apache.

[10/11] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/367a4d02 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/367a4d02 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/367a4d

[04/11] git commit: ACCUMULO-2524 Check for null args to ProblemReport constructors

ACCUMULO-2524 Check for null args to ProblemReport constructors Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1258b4e0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1258b4e0 Diff: http://git-wip-us.apache.

[09/11] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d3bd456e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d3bd456e Diff: http://git-wip-us.apache.org/repos/asf/

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

Author: bhavanki Date: Thu Mar 27 21:11:31 2014 New Revision: 903960 Log: Publishing svnmucc operation to accumulo site by bhavanki Added: websites/production/accumulo/content/ - copied from r903959, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/a

svn commit: r903959 - in /websites/staging/accumulo/trunk/content: ./ bylaws.html

Author: buildbot Date: Thu Mar 27 21:11:10 2014 New Revision: 903959 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/bylaws.html Propchange: websites/staging/accumulo/trunk/content/

svn commit: r1582476 - /accumulo/site/trunk/content/bylaws.mdtext

Author: bhavanki Date: Thu Mar 27 21:11:00 2014 New Revision: 1582476 URL: http://svn.apache.org/r1582476 Log: Remove "Resolving license disputes" from PMC responsibility list, unclear meaning Modified: accumulo/site/trunk/content/bylaws.mdtext Modified: accumulo/site/trunk/content/bylaws.m

[2/3] git commit: ACCUMULO-2453 Forgot to remove dependency from the default

ACCUMULO-2453 Forgot to remove dependency from the default Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3ce0bfda Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3ce0bfda Diff: http://git-wip-us.apache.org/r

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

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3c935b12 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3c935b12 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3c935b

[1/3] git commit: ACCUMULO-2453 Forgot to remove dependency from the default

Repository: accumulo Updated Branches: refs/heads/1.6.0-SNAPSHOT 334601992 -> 3ce0bfda3 refs/heads/master a194423d9 -> 3c935b129 ACCUMULO-2453 Forgot to remove dependency from the default Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repo

[9/9] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[8/9] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: test/src/test/java/org/apache/accumulo/test/ShellServerTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/33460199 Tree: http://git-wip-us.apac

[4/9] git commit: ACCUMULO-2453 Add in commons-httpclient test dependency

ACCUMULO-2453 Add in commons-httpclient test dependency Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4a05a17d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4a05a17d Diff: http://git-wip-us.apache.org/repo

[2/9] git commit: ACCUMULO-2433 Try to stabilize listscans on ShellServerTest

ACCUMULO-2433 Try to stabilize listscans on ShellServerTest Remove the ZKI and Connector timing from the 5s that we used to look for the slow scan that was running. Increase the amount of time inbetween calls to listscans. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: htt

[3/9] git commit: ACCUMULO-2433 Try to stabilize listscans on ShellServerTest

ACCUMULO-2433 Try to stabilize listscans on ShellServerTest Remove the ZKI and Connector timing from the 5s that we used to look for the slow scan that was running. Increase the amount of time inbetween calls to listscans. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: htt

[6/9] git commit: ACCUMULO-2453 Add in commons-httpclient test dependency

ACCUMULO-2453 Add in commons-httpclient test dependency Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4a05a17d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4a05a17d Diff: http://git-wip-us.apache.org/repo

[7/9] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: test/src/test/java/org/apache/accumulo/test/ShellServerTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/33460199 Tree: http://git-wip-us.apac

[1/9] git commit: ACCUMULO-2433 Try to stabilize listscans on ShellServerTest

Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 7ec60f1bc -> 4a05a17de refs/heads/1.6.0-SNAPSHOT 40299f89a -> 334601992 refs/heads/master 86ed88a16 -> a194423d9 ACCUMULO-2433 Try to stabilize listscans on ShellServerTest Remove the ZKI and Connector timing from the 5s that

[5/9] git commit: ACCUMULO-2453 Add in commons-httpclient test dependency

ACCUMULO-2453 Add in commons-httpclient test dependency Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4a05a17d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4a05a17d Diff: http://git-wip-us.apache.org/repo

[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Conflicts: core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.o

[1/4] ACCUMULO-1517 Generate LaTeX appendix for config

Repository: accumulo Updated Branches: refs/heads/master 2849cbd8e -> 86ed88a16 http://git-wip-us.apache.org/repos/asf/accumulo/blob/40299f89/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java --

[1/3] ACCUMULO-1517 Generate LaTeX appendix for config

Repository: accumulo Updated Branches: refs/heads/1.6.0-SNAPSHOT a8572fe57 -> 40299f89a http://git-wip-us.apache.org/repos/asf/accumulo/blob/40299f89/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java --

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

Author: busbey Date: Thu Mar 27 17:04:37 2014 New Revision: 903940 Log: Publishing svnmucc operation to accumulo site by busbey Added: websites/production/accumulo/content/ - copied from r903939, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apido

svn commit: r903939 - in /websites/staging/accumulo/trunk/content: ./ people.html

Author: buildbot Date: Thu Mar 27 17:00:13 2014 New Revision: 903939 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/people.html Propchange: websites/staging/accumulo/trunk/content/

svn commit: r1582400 - /accumulo/site/trunk/content/people.mdtext

Author: busbey Date: Thu Mar 27 16:59:59 2014 New Revision: 1582400 URL: http://svn.apache.org/r1582400 Log: updated contributor list for ACCUMULO-1945 and ACCUMULO-2544 Modified: accumulo/site/trunk/content/people.mdtext Modified: accumulo/site/trunk/content/people.mdtext URL: http://svn.a

[2/6] git commit: ACCUMULO-2544: Fix match boundaries for MockTableOperations.deleteRows to be consistent with actual accumulo instance

ACCUMULO-2544: Fix match boundaries for MockTableOperations.deleteRows to be consistent with actual accumulo instance Signed-off-by: Sean Busbey Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7ec60f1b Tree: http://gi

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

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2849cbd8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2849cbd8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2849cb

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

Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a8572fe5 Tree: h

[1/6] git commit: ACCUMULO-2544: Fix match boundaries for MockTableOperations.deleteRows to be consistent with actual accumulo instance

Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 72c9af4c6 -> 7ec60f1bc refs/heads/1.6.0-SNAPSHOT 5d030cae9 -> a8572fe57 refs/heads/master 8485134d7 -> 2849cbd8e ACCUMULO-2544: Fix match boundaries for MockTableOperations.deleteRows to be consistent with actual accumulo ins

[3/6] git commit: ACCUMULO-2544: Fix match boundaries for MockTableOperations.deleteRows to be consistent with actual accumulo instance

ACCUMULO-2544: Fix match boundaries for MockTableOperations.deleteRows to be consistent with actual accumulo instance Signed-off-by: Sean Busbey Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7ec60f1b Tree: http://gi

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

Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a8572fe5 Tree: h

[2/4] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' 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/72c9af4c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/72c9af4c Diff: http://git-wip-us.apache.org/repos/asf/

[3/4] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5d030cae Tree: http://

[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8485134d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8485134d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/848513

[1/4] git commit: ACCUMULO-2520 change new log message about invalid delets from err to warn

Repository: accumulo Updated Branches: refs/heads/master be9cd71c2 -> 8485134d7 ACCUMULO-2520 change new log message about invalid delets from err to warn Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/46191014 Tree

[3/3] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5d030cae Tree: http://

[1/3] git commit: ACCUMULO-2520 change new log message about invalid delets from err to warn

Repository: accumulo Updated Branches: refs/heads/1.6.0-SNAPSHOT a5a055233 -> 5d030cae9 ACCUMULO-2520 change new log message about invalid delets from err to warn Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/46191

[2/3] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' 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/72c9af4c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/72c9af4c Diff: http://git-wip-us.apache.org/repos/asf/

[1/2] git commit: ACCUMULO-2520 change new log message about invalid delets from err to warn

Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 1140d0077 -> 72c9af4c6 ACCUMULO-2520 change new log message about invalid delets from err to warn Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/46191

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

Merge branch '1.4.5-SNAPSHOT' 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/72c9af4c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/72c9af4c Diff: http://git-wip-us.apache.org/repos/asf/

git commit: ACCUMULO-2520 change new log message about invalid delets from err to warn

Repository: accumulo Updated Branches: refs/heads/1.4.5-SNAPSHOT 3bf240429 -> 461910148 ACCUMULO-2520 change new log message about invalid delets from err to warn Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/46191