[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/a2652c3c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a2652c3c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a2652c

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

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java test/src/test/java/org/apache/accumulo/test/functional/CleanUpIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http

[1/3] git commit: ACCUMULO-2128 Remove warnings introduced by merge

Updated Branches: refs/heads/master ac28b2253 -> a2652c3c4 ACCUMULO-2128 Remove warnings introduced by merge Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/21b1b110 Tree: http://git-wip-us.apache.org/repos/asf/accum

[2/2] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java test/src/test/java/org/apache/accumulo/test/functional/CleanUpIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http

[1/2] git commit: ACCUMULO-2128 Remove warnings introduced by merge

Updated Branches: refs/heads/1.6.0-SNAPSHOT da9e0f40a -> 98211f581 ACCUMULO-2128 Remove warnings introduced by merge Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/21b1b110 Tree: http://git-wip-us.apache.org/repos/a

git commit: ACCUMULO-2128 Remove warnings introduced by merge

Updated Branches: refs/heads/1.5.1-SNAPSHOT 400b991fb -> 21b1b1108 ACCUMULO-2128 Remove warnings introduced by merge Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/21b1b110 Tree: http://git-wip-us.apache.org/repos/a

[1/2] git commit: ACCUMULO-2142 Return the HostAndPort from creating the thrift server

Updated Branches: refs/heads/master 33a094de4 -> ac28b2253 ACCUMULO-2142 Return the HostAndPort from creating the thrift server The GC returned the original HostAndPort object instead of the one returned by TServerUtils, and ultimately the HsHaServer. The problem here is that TServerUtils is d

[2/2] 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/ac28b225 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ac28b225 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ac28b2

git commit: ACCUMULO-2142 Return the HostAndPort from creating the thrift server

Updated Branches: refs/heads/1.6.0-SNAPSHOT ea8fe5414 -> da9e0f40a ACCUMULO-2142 Return the HostAndPort from creating the thrift server The GC returned the original HostAndPort object instead of the one returned by TServerUtils, and ultimately the HsHaServer. The problem here is that TServerUt

[2/2] 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/33a094de Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/33a094de Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/33a094

[1/2] git commit: ACCUMULO-1976 Fix upgrade broken by ACCUMULO-2093

Updated Branches: refs/heads/master 4fbba38ae -> 33a094de4 ACCUMULO-1976 Fix upgrade broken by ACCUMULO-2093 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ea8fe541 Tree: http://git-wip-us.apache.org/repos/asf/accum

git commit: ACCUMULO-1976 Fix upgrade broken by ACCUMULO-2093

Updated Branches: refs/heads/1.6.0-SNAPSHOT 9c092cadd -> ea8fe5414 ACCUMULO-1976 Fix upgrade broken by ACCUMULO-2093 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ea8fe541 Tree: http://git-wip-us.apache.org/repos/a

[4/6] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commi

[5/6] git commit: Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/comm

[2/6] git commit: ACCUMULO-2128 added utility to cleanup accumulo static resources

ACCUMULO-2128 added utility to cleanup accumulo static resources Signed-off-by: Keith Turner Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/715825b3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/715825b3

[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/4fbba38a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4fbba38a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4fbba3

[3/6] git commit: ACCUMULO-2128 added test for static clean up utility

ACCUMULO-2128 added test for static clean up utility Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8f9fe417 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8f9fe417 Diff: http://git-wip-us.apache.org/repos/a

[1/6] git commit: ACCUMULO-2128 added waitForZooKeeperClientThreads method

Updated Branches: refs/heads/master b8bd259d0 -> 4fbba38ae ACCUMULO-2128 added waitForZooKeeperClientThreads method Signed-off-by: Keith Turner Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c94a73f4 Tree: http://

[5/5] git commit: Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/comm

[2/5] git commit: ACCUMULO-2128 added utility to cleanup accumulo static resources

ACCUMULO-2128 added utility to cleanup accumulo static resources Signed-off-by: Keith Turner Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/715825b3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/715825b3

[1/5] git commit: ACCUMULO-2128 added waitForZooKeeperClientThreads method

Updated Branches: refs/heads/1.6.0-SNAPSHOT ee3ccb82d -> 9c092cadd ACCUMULO-2128 added waitForZooKeeperClientThreads method Signed-off-by: Keith Turner Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c94a73f4 Tree:

[3/5] git commit: ACCUMULO-2128 added test for static clean up utility

ACCUMULO-2128 added test for static clean up utility Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8f9fe417 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8f9fe417 Diff: http://git-wip-us.apache.org/repos/a

[4/5] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commi

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

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commi

[3/4] git commit: ACCUMULO-2128 added test for static clean up utility

ACCUMULO-2128 added test for static clean up utility Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8f9fe417 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8f9fe417 Diff: http://git-wip-us.apache.org/repos/a

[1/4] git commit: ACCUMULO-2128 added waitForZooKeeperClientThreads method

Updated Branches: refs/heads/1.5.1-SNAPSHOT a91ee4dde -> 400b991fb ACCUMULO-2128 added waitForZooKeeperClientThreads method Signed-off-by: Keith Turner Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c94a73f4 Tree:

[2/4] git commit: ACCUMULO-2128 added utility to cleanup accumulo static resources

ACCUMULO-2128 added utility to cleanup accumulo static resources Signed-off-by: Keith Turner Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/715825b3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/715825b3

[1/3] git commit: ACCUMULO-2128 added waitForZooKeeperClientThreads method

Updated Branches: refs/heads/1.4.5-SNAPSHOT 71f150a77 -> 8f9fe4175 ACCUMULO-2128 added waitForZooKeeperClientThreads method Signed-off-by: Keith Turner Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c94a73f4 Tree:

[3/3] git commit: ACCUMULO-2128 added test for static clean up utility

ACCUMULO-2128 added test for static clean up utility Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8f9fe417 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8f9fe417 Diff: http://git-wip-us.apache.org/repos/a

[2/3] git commit: ACCUMULO-2128 added utility to cleanup accumulo static resources

ACCUMULO-2128 added utility to cleanup accumulo static resources Signed-off-by: Keith Turner Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/715825b3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/715825b3

[14/18] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

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

[11/18] git commit: ACCUMULO-2126 Hadoop profile names should be consistent across branches.

ACCUMULO-2126 Hadoop profile names should be consistent across branches. Changes naming scheme to be by Hadoop generation, i.e. hadoop-1 and hadoop-2. Adds ability to either rely on default or to specify default by profile, i.e. hadoop.profile=1 on 1.4. Adds a more helpful error message when th

[12/18] git commit: ACCUMULO-2126 Hadoop profile names should be consistent across branches.

ACCUMULO-2126 Hadoop profile names should be consistent across branches. Changes naming scheme to be by Hadoop generation, i.e. hadoop-1 and hadoop-2. Adds ability to either rely on default or to specify default by profile, i.e. hadoop.profile=1 on 1.4. Adds a more helpful error message when th

[13/18] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

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

[18/18] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

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

[03/18] git commit: ACCUMULO-1933 Make unit on memory parameters case-insensitive.

ACCUMULO-1933 Make unit on memory parameters case-insensitive. 1. Added support for both cases for G, M, K and B 2. Added warning message for lower case b and that the code will consider this bytes 3. Added meaningful error message for any number formatting issues 4. Added unit test that test

[09/18] git commit: ACCUMULO-2126 Hadoop profile names should be consistent across branches.

ACCUMULO-2126 Hadoop profile names should be consistent across branches. Changes naming scheme to be by Hadoop generation, i.e. hadoop-1 and hadoop-2. Adds ability to either rely on default or to specify default by profile, i.e. hadoop.profile=1 on 1.4. Adds a more helpful error message when th

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

Merge branch '1.5.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/65aaddd1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6

[04/18] git commit: ACCUMULO-2141 found a typo

ACCUMULO-2141 found a typo Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a18e469e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a18e469e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a18e469e

[02/18] git commit: ACCUMULO-1933 Make unit on memory parameters case-insensitive.

ACCUMULO-1933 Make unit on memory parameters case-insensitive. 1. Added support for both cases for G, M, K and B 2. Added warning message for lower case b and that the code will consider this bytes 3. Added meaningful error message for any number formatting issues 4. Added unit test that test

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

Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo 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/4a873834 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4

[17/18] 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/b8bd259d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b8bd259d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b8bd25

[10/18] git commit: ACCUMULO-2126 Hadoop profile names should be consistent across branches.

ACCUMULO-2126 Hadoop profile names should be consistent across branches. Changes naming scheme to be by Hadoop generation, i.e. hadoop-1 and hadoop-2. Adds ability to either rely on default or to specify default by profile, i.e. hadoop.profile=1 on 1.4. Adds a more helpful error message when th

[01/18] git commit: ACCUMULO-1933 Make unit on memory parameters case-insensitive.

Updated Branches: refs/heads/1.4.5-SNAPSHOT 65d5fba87 -> 71f150a77 refs/heads/1.5.1-SNAPSHOT 65aaddd17 -> a91ee4dde refs/heads/1.6.0-SNAPSHOT 4a8738349 -> ee3ccb82d refs/heads/master e2e7d2e5c -> b8bd259d0 ACCUMULO-1933 Make unit on memory parameters case-insensitive. 1. Added support fo

[16/18] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

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

[05/18] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

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

[15/18] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

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

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

Merge branch '1.5.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/65aaddd1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6

Git Push Summary

Updated Branches: refs/heads/1.5.0 [deleted] 5266a71be

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

Author: ecn Date: Mon Jan 6 23:38:45 2014 New Revision: 893078 Log: Publishing svnmucc operation to accumulo site by ecn Added: websites/production/accumulo/content/ - copied from r893077, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apidocs/

svn commit: r893077 - in /websites/staging/accumulo/trunk/content: ./ 1.5/examples/dirlist.html

Author: buildbot Date: Mon Jan 6 23:38:12 2014 New Revision: 893077 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/1.5/examples/dirlist.html Propchange: websites/staging/accumulo/t

svn commit: r1556070 - /accumulo/site/trunk/content/1.5/examples/dirlist.mdtext

Author: ecn Date: Mon Jan 6 23:38:03 2014 New Revision: 1556070 URL: http://svn.apache.org/r1556070 Log: ACCUMULO-2141 fixed typo and old syntax Modified: accumulo/site/trunk/content/1.5/examples/dirlist.mdtext Modified: accumulo/site/trunk/content/1.5/examples/dirlist.mdtext URL: http://s

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

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

[01/10] git commit: ACCUMULO-2128 Revert "ACCUMULO-1889 found a few more ZooKeeperInstances that are not closed"

Updated Branches: refs/heads/master b7d15fce1 -> e2e7d2e5c ACCUMULO-2128 Revert "ACCUMULO-1889 found a few more ZooKeeperInstances that are not closed" This reverts commit 674fa95cacaa9353142071a66006e0ffb65cae94. Conflicts: core/src/main/java/org/apache/accumulo/core/client/mapredu

[05/10] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImp

[10/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/e2e7d2e5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e2e7d2e5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e2e7d2

[2/8] git commit: ACCUMULO-970 Rename 1.5.0-RC5 tag to 1.5.0

ACCUMULO-970 Rename 1.5.0-RC5 tag to 1.5.0 git-svn-id: https://svn.apache.org/repos/asf/accumulo/tags/1.5.0@1486259 13f79535-47bb-0310-9956-ffa450edef68 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5266a71b Tree: h

[5/8] git commit: ACCUMULO-2141 found a typo

ACCUMULO-2141 found a typo Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a18e469e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a18e469e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a18e469e

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

Merge branch '1.5.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/65aaddd1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6

[06/10] git commit: ACCUMULO-2141 updating docs to 1.5 option parsing

ACCUMULO-2141 updating docs to 1.5 option parsing Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4c9a6662 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4c9a6662 Diff: http://git-wip-us.apache.org/repos/asf/

[08/10] git commit: ACCUMULO-1933 Make unit on memory parameters case-insensitive.

ACCUMULO-1933 Make unit on memory parameters case-insensitive. 1. Added support for both cases for G, M, K and B 2. Added warning message for lower case b and that the code will consider this bytes 3. Added meaningful error message for any number formatting issues 4. Added unit test that test

[3/8] git commit: ACCUMULO-2141 updating docs to 1.5 option parsing

ACCUMULO-2141 updating docs to 1.5 option parsing Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4c9a6662 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4c9a6662 Diff: http://git-wip-us.apache.org/repos/asf/

[4/8] git commit: ACCUMULO-2141 found a typo

ACCUMULO-2141 found a typo Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a18e469e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a18e469e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a18e469e

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

Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo 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/4a873834 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4

[02/10] git commit: ACCUMULO-1858 revert commits that added ZooKeeperInstance.close()

ACCUMULO-1858 revert commits that added ZooKeeperInstance.close() Revert "ACCUMULO-2027 Synchronized access to ZooKeeperInstance methods that mutated state" This reverts commit 975e8c05e8d11f3848e6c800f4d2772026f6c3a3. Revert "ACCUMULO-1984 Rework interruption for instance implementations." Th

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

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

[1/8] git commit: [maven-release-plugin] copy for tag 1.5.0-RC5

Updated Branches: refs/heads/1.5.0 [created] 5266a71be refs/heads/1.5.1-SNAPSHOT f43ba3bb7 -> 65aaddd17 refs/heads/1.6.0-SNAPSHOT d1f3dfe8a -> 4a8738349 [maven-release-plugin] copy for tag 1.5.0-RC5 git-svn-id: https://svn.apache.org/repos/asf/accumulo/tags/1.5.0-RC5@1484984 13f79535-47b

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

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

[2/2] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

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

[1/2] git commit: ACCUMULO-1933 Make unit on memory parameters case-insensitive.

Updated Branches: refs/heads/1.6.0-SNAPSHOT 278134909 -> d1f3dfe8a ACCUMULO-1933 Make unit on memory parameters case-insensitive. 1. Added support for both cases for G, M, K and B 2. Added warning message for lower case b and that the code will consider this bytes 3. Added meaningful error

git commit: ACCUMULO-1933 Make unit on memory parameters case-insensitive.

Updated Branches: refs/heads/1.5.1-SNAPSHOT f624d402e -> f43ba3bb7 ACCUMULO-1933 Make unit on memory parameters case-insensitive. 1. Added support for both cases for G, M, K and B 2. Added warning message for lower case b and that the code will consider this bytes 3. Added meaningful error

git commit: ACCUMULO-1933 Make unit on memory parameters case-insensitive.

Updated Branches: refs/heads/1.4.5-SNAPSHOT e946ba052 -> 65d5fba87 ACCUMULO-1933 Make unit on memory parameters case-insensitive. 1. Added support for both cases for G, M, K and B 2. Added warning message for lower case b and that the code will consider this bytes 3. Added meaningful error

[1/2] git commit: ACCUMULO-2141 updating docs to 1.5 option parsing

Updated Branches: refs/heads/1.6.0-SNAPSHOT f17661cd1 -> 278134909 ACCUMULO-2141 updating docs to 1.5 option parsing Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4c9a6662 Tree: http://git-wip-us.apache.org/repos/a

[2/2] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

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

[1/3] git commit: ACCUMULO-1858 revert commits that added ZooKeeperInstance.close()

Updated Branches: refs/heads/1.5.1-SNAPSHOT c23126a86 -> f624d402e ACCUMULO-1858 revert commits that added ZooKeeperInstance.close() Revert "ACCUMULO-2027 Synchronized access to ZooKeeperInstance methods that mutated state" This reverts commit 975e8c05e8d11f3848e6c800f4d2772026f6c3a3. Rever

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

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImp

[1/4] git commit: ACCUMULO-1858 revert commits that added ZooKeeperInstance.close()

Updated Branches: refs/heads/1.6.0-SNAPSHOT 016f3bb10 -> f17661cd1 ACCUMULO-1858 revert commits that added ZooKeeperInstance.close() Revert "ACCUMULO-2027 Synchronized access to ZooKeeperInstance methods that mutated state" This reverts commit 975e8c05e8d11f3848e6c800f4d2772026f6c3a3. Rever

git commit: ACCUMULO-1858 revert commits that added ZooKeeperInstance.close()

Updated Branches: refs/heads/1.4.5-SNAPSHOT 8669b80f9 -> e946ba052 ACCUMULO-1858 revert commits that added ZooKeeperInstance.close() Revert "ACCUMULO-2027 Synchronized access to ZooKeeperInstance methods that mutated state" This reverts commit 975e8c05e8d11f3848e6c800f4d2772026f6c3a3. Rever

git commit: ACCUMULO-2128 Revert "ACCUMULO-1889 found a few more ZooKeeperInstances that are not closed"

Updated Branches: refs/heads/1.6.0-SNAPSHOT cb1243a8a -> 016f3bb10 ACCUMULO-2128 Revert "ACCUMULO-1889 found a few more ZooKeeperInstances that are not closed" This reverts commit 674fa95cacaa9353142071a66006e0ffb65cae94. Conflicts: core/src/main/java/org/apache/accumulo/core/client

[18/20] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

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

[16/20] git commit: ACCUMULO-1944 Restore test runs when Cobertura not installed

ACCUMULO-1944 Restore test runs when Cobertura not installed The changes in the prior commit to re-enable test coverage assume that Cobertura is available. When it isn't, functional test runs fail. This commit allows runs to proceed when Cobertura is not installed. Project: http://git-wip-us.apa

[13/20] git commit: ACCUMULO-1944 Fix coverage for functional tests

ACCUMULO-1944 Fix coverage for functional tests The -C flag for test/system/auto/run.py did not work. This changeset allows it to work again if a functional Cobertura installation is placed under $ACCUMULO_HOME/lib/test/cobertura. The code for producing instrumented Accumulo code was inactive and

[14/20] git commit: ACCUMULO-1944 Fix coverage for functional tests

ACCUMULO-1944 Fix coverage for functional tests The -C flag for test/system/auto/run.py did not work. This changeset allows it to work again if a functional Cobertura installation is placed under $ACCUMULO_HOME/lib/test/cobertura. The code for producing instrumented Accumulo code was inactive and

[06/20] git commit: ACCUMULO-1944 Fix coverage for functional tests

ACCUMULO-1944 Fix coverage for functional tests The -C flag for test/system/auto/run.py did not work. This changeset allows it to work again if a functional Cobertura installation is placed under $ACCUMULO_HOME/lib/test/cobertura. The code for producing instrumented Accumulo code was inactive and

[11/20] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9520ccb0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9520ccb0 Diff: http://git-wip-us.apache.org/repos/asf/

[05/20] git commit: ACCUMULO-1944 Fix coverage for functional tests

ACCUMULO-1944 Fix coverage for functional tests The -C flag for test/system/auto/run.py did not work. This changeset allows it to work again if a functional Cobertura installation is placed under $ACCUMULO_HOME/lib/test/cobertura. The code for producing instrumented Accumulo code was inactive and

[20/20] 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/b7d15fce Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b7d15fce Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b7d15f

[15/20] git commit: ACCUMULO-1944 Restore test runs when Cobertura not installed

ACCUMULO-1944 Restore test runs when Cobertura not installed The changes in the prior commit to re-enable test coverage assume that Cobertura is available. When it isn't, functional test runs fail. This commit allows runs to proceed when Cobertura is not installed. Project: http://git-wip-us.apa

[12/20] git commit: ACCUMULO-1944 Fix coverage for functional tests

ACCUMULO-1944 Fix coverage for functional tests The -C flag for test/system/auto/run.py did not work. This changeset allows it to work again if a functional Cobertura installation is placed under $ACCUMULO_HOME/lib/test/cobertura. The code for producing instrumented Accumulo code was inactive and

[08/20] git commit: ACCUMULO-1944 Restore test runs when Cobertura not installed

ACCUMULO-1944 Restore test runs when Cobertura not installed The changes in the prior commit to re-enable test coverage assume that Cobertura is available. When it isn't, functional test runs fail. This commit allows runs to proceed when Cobertura is not installed. Project: http://git-wip-us.apa

[09/20] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9520ccb0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9520ccb0 Diff: http://git-wip-us.apache.org/repos/asf/

[19/20] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

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

[01/20] git commit: ACCUMULO-1944 Restore test runs when Cobertura not installed

Updated Branches: refs/heads/1.4.5-SNAPSHOT 25a7fdaee -> 8669b80f9 refs/heads/1.5.1-SNAPSHOT feccaa4b1 -> c23126a86 refs/heads/1.6.0-SNAPSHOT 68b60234f -> cb1243a8a refs/heads/master 799ce56ff -> b7d15fce1 ACCUMULO-1944 Restore test runs when Cobertura not installed The changes in the pr

[07/20] git commit: ACCUMULO-1944 Fix coverage for functional tests

ACCUMULO-1944 Fix coverage for functional tests The -C flag for test/system/auto/run.py did not work. This changeset allows it to work again if a functional Cobertura installation is placed under $ACCUMULO_HOME/lib/test/cobertura. The code for producing instrumented Accumulo code was inactive and

[17/20] git commit: ACCUMULO-1944 Restore test runs when Cobertura not installed

ACCUMULO-1944 Restore test runs when Cobertura not installed The changes in the prior commit to re-enable test coverage assume that Cobertura is available. When it isn't, functional test runs fail. This commit allows runs to proceed when Cobertura is not installed. Project: http://git-wip-us.apa

[10/20] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9520ccb0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9520ccb0 Diff: http://git-wip-us.apache.org/repos/asf/

[02/20] git commit: ACCUMULO-1944 Restore test runs when Cobertura not installed

ACCUMULO-1944 Restore test runs when Cobertura not installed The changes in the prior commit to re-enable test coverage assume that Cobertura is available. When it isn't, functional test runs fail. This commit allows runs to proceed when Cobertura is not installed. Project: http://git-wip-us.apa

[03/20] git commit: ACCUMULO-1944 Fix coverage for functional tests

ACCUMULO-1944 Fix coverage for functional tests The -C flag for test/system/auto/run.py did not work. This changeset allows it to work again if a functional Cobertura installation is placed under $ACCUMULO_HOME/lib/test/cobertura. The code for producing instrumented Accumulo code was inactive and

[04/20] git commit: ACCUMULO-1944 Restore test runs when Cobertura not installed

ACCUMULO-1944 Restore test runs when Cobertura not installed The changes in the prior commit to re-enable test coverage assume that Cobertura is available. When it isn't, functional test runs fail. This commit allows runs to proceed when Cobertura is not installed. Project: http://git-wip-us.apa

svn commit: r893014 - in /websites/staging/accumulo/trunk/content: ./ papers.html

Author: buildbot Date: Mon Jan 6 16:42:12 2014 New Revision: 893014 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/papers.html Propchange: websites/staging/accumulo/trunk/content/

  1   2   >