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

2014-04-23 Thread bhavanki 
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/62bdba0f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/62bdba0f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/62bdba0f

Branch: refs/heads/master
Commit: 62bdba0f335b6ad4fbeb4e5deb1e436718600d0b
Parents: 7548cb7 782975a
Author: Bill Havanki bhava...@cloudera.com
Authored: Wed Apr 23 11:10:01 2014 -0400
Committer: Bill Havanki bhava...@cloudera.com
Committed: Wed Apr 23 11:10:01 2014 -0400

--
 .../main/java/org/apache/accumulo/server/tablets/TabletTime.java | 4 
 1 file changed, 4 insertions(+)
--

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

2014-03-26 Thread busbey 
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/be9cd71c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/be9cd71c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/be9cd71c

Branch: refs/heads/master
Commit: be9cd71c28fc51fb131ff6cbcab306b4d1c4dc8c
Parents: abb545f a5a0552
Author: Sean Busbey bus...@cloudera.com
Authored: Thu Mar 27 00:05:38 2014 -0500
Committer: Sean Busbey bus...@cloudera.com
Committed: Thu Mar 27 00:05:38 2014 -0500

--
 start/src/main/java/org/apache/accumulo/start/Main.java | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)
--

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

2014-03-21 Thread bhavanki 
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/262af748
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/262af748
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/262af748

Branch: refs/heads/master
Commit: 262af74832f707cc90778188e48e9c5a7a546208
Parents: 1429eca 341e60b
Author: Bill Havanki bhava...@cloudera.com
Authored: Fri Mar 21 14:50:10 2014 -0400
Committer: Bill Havanki bhava...@cloudera.com
Committed: Fri Mar 21 14:50:10 2014 -0400

--
 test/system/bench/README  | 44 --
 test/system/bench/README.md   | 45 +++
 test/system/continuous/README | 80 -
 test/system/continuous/README.md  | 81 ++
 test/system/randomwalk/README | 62 --
 test/system/randomwalk/README.md  | 69 +
 test/system/scalability/README| 38 
 test/system/scalability/README.md | 40 +
 test/system/test1/README  | 26 ---
 test/system/test1/README.md   | 29 
 test/system/test2/README  |  7 ---
 test/system/test2/README.md   | 10 +
 test/system/test3/README  |  2 -
 test/system/test3/README.md   |  5 +++
 test/system/test4/README  |  6 ---
 test/system/test4/README.md   |  9 
 16 files changed, 288 insertions(+), 265 deletions(-)
--

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

2014-03-20 Thread bhavanki 
Merge branch '1.6.0-SNAPSHOT'

Conflicts:

test/src/main/java/org/apache/accumulo/test/randomwalk/security/DropUser.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b644edad
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b644edad
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b644edad

Branch: refs/heads/master
Commit: b644edade2041f05cd837542cadce3fa5a7e2923
Parents: 7988f8f aefa52e
Author: Bill Havanki bhava...@cloudera.com
Authored: Thu Mar 20 15:02:19 2014 -0400
Committer: Bill Havanki bhava...@cloudera.com
Committed: Thu Mar 20 15:02:19 2014 -0400

--
 .../java/org/apache/accumulo/test/randomwalk/security/DropUser.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b644edad/test/src/main/java/org/apache/accumulo/test/randomwalk/security/DropUser.java
--
diff --cc 
test/src/main/java/org/apache/accumulo/test/randomwalk/security/DropUser.java
index f310116,d48a2cd..40bde3b
--- 
a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/DropUser.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/DropUser.java
@@@ -60,7 -59,8 +60,8 @@@ public class DropUser extends Test 
throw new AccumuloException(Got unexpected exception, ae);
}
  }
 -WalkingSecurity.get(state).dropUser(tableUserName);
 +WalkingSecurity.get(state,env).dropUser(tableUserName);
+ Thread.sleep(1000);
  if (!hasPermission)
throw new AccumuloException(Didn't get Security Exception when we 
should have);
}

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

2014-03-20 Thread elserj 
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/394fe061
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/394fe061
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/394fe061

Branch: refs/heads/master
Commit: 394fe061fb896e740b0932a9736c0fcc16caee95
Parents: b644eda 44b13c1
Author: Josh Elser els...@apache.org
Authored: Thu Mar 20 17:48:57 2014 -0400
Committer: Josh Elser els...@apache.org
Committed: Thu Mar 20 17:48:57 2014 -0400

--
 .../minicluster/impl/MiniAccumuloClusterImpl.java   | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/394fe061/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
--

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

2014-03-18 Thread bhavanki 
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/7cd08751
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7cd08751
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7cd08751

Branch: refs/heads/master
Commit: 7cd087516a80a92cbeb640c5877672050767f684
Parents: 39807cb 99b6e25
Author: Bill Havanki bhava...@cloudera.com
Authored: Tue Mar 18 16:24:08 2014 -0400
Committer: Bill Havanki bhava...@cloudera.com
Committed: Tue Mar 18 16:24:08 2014 -0400

--
 .../test/randomwalk/concurrent/CheckBalance.java  | 18 +++---
 1 file changed, 15 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7cd08751/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CheckBalance.java
--

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

2014-03-18 Thread bhavanki 
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/23980d36
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/23980d36
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/23980d36

Branch: refs/heads/master
Commit: 23980d36ca7ba50f9ffc8c924bfa000c4bcd3bd8
Parents: 7cd0875 84cc955
Author: Bill Havanki bhava...@cloudera.com
Authored: Tue Mar 18 16:55:29 2014 -0400
Committer: Bill Havanki bhava...@cloudera.com
Committed: Tue Mar 18 16:55:29 2014 -0400

--

--

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

2014-03-13 Thread bhavanki 
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/33b872fd
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/33b872fd
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/33b872fd

Branch: refs/heads/master
Commit: 33b872fd0cea518f41ee0fb6d2c551ae4769fb19
Parents: 28c23e6 58ec7b1
Author: Bill Havanki bhava...@cloudera.com
Authored: Thu Mar 13 10:41:10 2014 -0400
Committer: Bill Havanki bhava...@cloudera.com
Committed: Thu Mar 13 10:41:10 2014 -0400

--
 .../apache/accumulo/test/randomwalk/security/SecurityFixture.java  | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/33b872fd/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityFixture.java
--

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

2014-03-12 Thread bhavanki 
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/28c23e6a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/28c23e6a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/28c23e6a

Branch: refs/heads/master
Commit: 28c23e6aa40ccf526573e25c30defd5698ae
Parents: 2368eef 7ed250a
Author: Bill Havanki bhava...@cloudera.com
Authored: Wed Mar 12 16:54:22 2014 -0400
Committer: Bill Havanki bhava...@cloudera.com
Committed: Wed Mar 12 16:54:22 2014 -0400

--
 .../tserver/TabletServerResourceManager.java | 19 ---
 1 file changed, 12 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/28c23e6a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
--

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

2014-03-11 Thread bhavanki 
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/ae462097
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ae462097
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ae462097

Branch: refs/heads/master
Commit: ae46209729a2746a4b6c06fa73fc0b0a188a932a
Parents: 29e2519 6b2704c
Author: Bill Havanki bhava...@cloudera.com
Authored: Tue Mar 11 12:19:40 2014 -0400
Committer: Bill Havanki bhava...@cloudera.com
Committed: Tue Mar 11 12:19:40 2014 -0400

--

--

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

2014-02-25 Thread mdrob 
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/6083fbca
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6083fbca
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6083fbca

Branch: refs/heads/master
Commit: 6083fbca5d2ba2f8ce3337e4d33111ca07cc1eb7
Parents: 1336099 1d39648
Author: Mike Drob md...@cloudera.com
Authored: Tue Feb 25 14:52:26 2014 -0500
Committer: Mike Drob md...@cloudera.com
Committed: Tue Feb 25 14:52:26 2014 -0500

--
 .../java/org/apache/accumulo/start/Main.java| 26 +---
 1 file changed, 22 insertions(+), 4 deletions(-)
--

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

2014-02-24 Thread mdrob 
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/0f78d23d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0f78d23d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0f78d23d

Branch: refs/heads/master
Commit: 0f78d23d0accb2f1cd10843c75862f3875b8fd92
Parents: e9c23fa 14d6b0b
Author: Mike Drob md...@cloudera.com
Authored: Mon Feb 24 12:32:29 2014 -0500
Committer: Mike Drob md...@cloudera.com
Committed: Mon Feb 24 12:32:29 2014 -0500

--
 .../accumulo/trace/instrument/TraceProxy.java   | 37 ---
 .../accumulo/trace/instrument/TracerTest.java   | 38 
 2 files changed, 63 insertions(+), 12 deletions(-)
--

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

2014-02-20 Thread bhavanki 
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/51bcc297
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/51bcc297
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/51bcc297

Branch: refs/heads/master
Commit: 51bcc29737dccd812ff139cbe5a09eee71314998
Parents: bed1643 ce1d965
Author: Bill Havanki bhava...@cloudera.com
Authored: Thu Feb 20 16:55:00 2014 -0500
Committer: Bill Havanki bhava...@cloudera.com
Committed: Thu Feb 20 16:55:00 2014 -0500

--

--

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

2014-01-30 Thread bhavanki 
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/cac5e121
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cac5e121
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cac5e121

Branch: refs/heads/master
Commit: cac5e121b8e8fae2e06f756077cb44549d211504
Parents: f115f19 4945783
Author: Bill Havanki bhava...@cloudera.com
Authored: Thu Jan 30 11:22:38 2014 -0500
Committer: Bill Havanki bhava...@cloudera.com
Committed: Thu Jan 30 11:22:38 2014 -0500

--

--

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

2014-01-27 Thread elserj 
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/3132b012
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3132b012
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3132b012

Branch: refs/heads/master
Commit: 3132b0121f7cab6882c19b0f94a41dac154c1c95
Parents: 0524ddb f67603f
Author: Josh Elser els...@apache.org
Authored: Mon Jan 27 15:02:09 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Mon Jan 27 15:02:09 2014 -0500

--
 conf/examples/1GB/native-standalone/accumulo-env.sh   | 2 +-
 conf/examples/1GB/standalone/accumulo-env.sh  | 2 +-
 conf/examples/2GB/native-standalone/accumulo-env.sh   | 2 +-
 conf/examples/2GB/standalone/accumulo-env.sh  | 2 +-
 conf/examples/3GB/native-standalone/accumulo-env.sh   | 2 +-
 conf/examples/3GB/standalone/accumulo-env.sh  | 2 +-
 conf/examples/512MB/native-standalone/accumulo-env.sh | 2 +-
 conf/examples/512MB/standalone/accumulo-env.sh| 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
--

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

2014-01-24 Thread bhavanki 
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/0524ddbf
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0524ddbf
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0524ddbf

Branch: refs/heads/master
Commit: 0524ddbfb143336fdc56fb6d56c7c602c9f3e62f
Parents: c4af6f2 19da920
Author: Bill Havanki bhava...@cloudera.com
Authored: Fri Jan 24 15:24:43 2014 -0500
Committer: Bill Havanki bhava...@cloudera.com
Committed: Fri Jan 24 15:24:43 2014 -0500

--

--

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

2014-01-22 Thread bhavanki 
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/31b68c40
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/31b68c40
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/31b68c40

Branch: refs/heads/master
Commit: 31b68c40f7ce9046f560fce7fdb0eb23e0edf8da
Parents: 5b4ec33 b642d1b
Author: Bill Havanki bhava...@cloudera.com
Authored: Wed Jan 22 14:05:57 2014 -0500
Committer: Bill Havanki bhava...@cloudera.com
Committed: Wed Jan 22 14:05:57 2014 -0500

--
 test/system/randomwalk/README | 10 ++
 1 file changed, 10 insertions(+)
--

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

2014-01-22 Thread elserj 
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/996fe113
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/996fe113
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/996fe113

Branch: refs/heads/master
Commit: 996fe113ccc4bc1cd00da5cca29d50c6cb55219a
Parents: 680433b 2e65817
Author: Josh Elser els...@apache.org
Authored: Wed Jan 22 17:09:51 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Wed Jan 22 17:09:51 2014 -0500

--
 .../core/client/mapreduce/RangeInputSplit.java  | 11 -
 .../mapreduce/lib/util/ConfiguratorBase.java| 13 +--
 .../test/continuous/ContinuousVerify.java   | 22 ++
 test/system/continuous/run-verify.sh| 24 +++-
 4 files changed, 66 insertions(+), 4 deletions(-)
--

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

2014-01-07 Thread mdrob 
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/5189eba2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5189eba2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5189eba2

Branch: refs/heads/master
Commit: 5189eba2c5bd048a8a77976609439bf958abcc7c
Parents: a72e80c 0213bd6
Author: Mike Drob md...@cloudera.com
Authored: Tue Jan 7 09:55:06 2014 -0800
Committer: Mike Drob md...@cloudera.com
Committed: Tue Jan 7 09:55:06 2014 -0800

--
 test/system/continuous/continuous-env.sh.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

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

2014-01-06 Thread vines 
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/e2e7d2e5

Branch: refs/heads/master
Commit: e2e7d2e5c7376f9ddd3fd261508034f512675139
Parents: b7d15fc d1f3dfe
Author: John Vines vi...@apache.org
Authored: Mon Jan 6 18:29:42 2014 -0500
Committer: John Vines vi...@apache.org
Committed: Mon Jan 6 18:29:42 2014 -0500

--
 .../apache/accumulo/core/client/Instance.java   |   8 +-
 .../accumulo/core/client/ZooKeeperInstance.java |  51 +---
 .../core/client/impl/ThriftTransportPool.java   |  16 +-
 .../client/mapreduce/AbstractInputFormat.java   | 254 +--
 .../client/mapreduce/AccumuloOutputFormat.java  |   5 +-
 .../mapreduce/lib/util/InputConfigurator.java   |   6 +-
 .../accumulo/core/client/mock/MockInstance.java |   5 -
 .../core/conf/AccumuloConfiguration.java|  35 ++-
 .../apache/accumulo/core/util/ThriftUtil.java   |   4 -
 .../core/client/impl/TabletLocatorImplTest.java |   5 -
 .../core/conf/AccumuloConfigurationTest.java|  48 
 .../accumulo/fate/zookeeper/ZooCache.java   |   7 -
 .../accumulo/fate/zookeeper/ZooReader.java  |  12 -
 .../accumulo/server/client/HdfsZooInstance.java |   6 -
 .../main/resources/docs/examples/README.dirlist |   2 +-
 15 files changed, 209 insertions(+), 255 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e2e7d2e5/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
--
diff --cc 
core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
index b3b82d3,8685d43..9ffe065
--- 
a/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
@@@ -153,27 -101,32 +153,40 @@@ public abstract class AccumuloConfigura
  return getMemoryInBytes(memString);
}

 +  /**
 +   * Interprets a string specifying a memory size. A memory size is specified
 +   * as a long integer followed by an optional B (bytes), K (KB), M (MB), or
 +   * G (GB).
 +   *
 +   * @param str string value
 +   * @return interpreted memory size
 +   */
static public long getMemoryInBytes(String str) {
  int multiplier = 0;
- switch (str.charAt(str.length() - 1)) {
-   case 'G':
- multiplier += 10;
-   case 'M':
- multiplier += 10;
-   case 'K':
- multiplier += 10;
-   case 'B':
- return Long.parseLong(str.substring(0, str.length() - 1))  
multiplier;
-   default:
- return Long.parseLong(str);
+ char lastChar = str.charAt(str.length() - 1);
+ 
+ if (lastChar == 'b') {
+   log.warn(The 'b' in  + str + 
+is being considered as bytes.  + 
+   Setting memory by bits is not supported);
+ }
+ try {
+   switch (Character.toUpperCase(lastChar)) {
+ case 'G':
+   multiplier += 10;
+ case 'M':
+   multiplier += 10;
+ case 'K':
+   multiplier += 10;
+ case 'B':
+   return Long.parseLong(str.substring(0, str.length() - 1))  
multiplier;
+ default:
+   return Long.parseLong(str);
+   }
+ } catch (Exception ex) {
+   throw new IllegalArgumentException(The value ' + str + 
+   ' is not a valid memory setting. A valid value would a number  +
+   possibily followed by an optional 'G', 'M', 'K', or 'B'.);
  }
}

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

2013-12-31 Thread mdrob 
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/a1eb475e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a1eb475e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a1eb475e

Branch: refs/heads/master
Commit: a1eb475ed2d0c2a0524ee7221297a783ce10e0c0
Parents: cc4e8e7 114b58d
Author: Mike Drob md...@cloudera.com
Authored: Tue Dec 31 13:38:25 2013 -0800
Committer: Mike Drob md...@cloudera.com
Committed: Tue Dec 31 13:38:25 2013 -0800

--

--

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

2013-12-27 Thread mdrob 
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/77b31b7c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/77b31b7c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/77b31b7c

Branch: refs/heads/master
Commit: 77b31b7c1517d22f47efd79780615c04a973a420
Parents: a267d34 f0f227a
Author: Mike Drob md...@cloudera.com
Authored: Fri Dec 27 17:20:43 2013 -0800
Committer: Mike Drob md...@cloudera.com
Committed: Fri Dec 27 17:20:43 2013 -0800

--
 pom.xml | 16 
 1 file changed, 16 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/77b31b7c/pom.xml
--

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

2013-12-18 Thread elserj 
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/3be435e9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3be435e9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3be435e9

Branch: refs/heads/master
Commit: 3be435e9fc7a20a65233f25cc1c52fdda586e8b4
Parents: ad676c1 152f194
Author: Josh Elser els...@apache.org
Authored: Wed Dec 18 21:54:34 2013 -0500
Committer: Josh Elser els...@apache.org
Committed: Wed Dec 18 21:54:34 2013 -0500

--
 bin/accumulo|   2 +-
 .../1GB/native-standalone/accumulo-site.xml |   5 +
 conf/examples/1GB/standalone/accumulo-site.xml  |   5 +
 .../2GB/native-standalone/accumulo-site.xml |   5 +
 conf/examples/2GB/standalone/accumulo-site.xml  | 123 ++-
 .../3GB/native-standalone/accumulo-site.xml |   5 +
 conf/examples/3GB/standalone/accumulo-site.xml  |   5 +
 .../512MB/native-standalone/accumulo-site.xml   |   5 +
 .../examples/512MB/standalone/accumulo-site.xml |   5 +
 conf/examples/crypto/accumulo-site.xml  |   5 +
 conf/examples/vfs-classloader/accumulo-site.xml |   5 +
 .../accumulo/core/security/SecurityUtil.java|   1 +
 12 files changed, 111 insertions(+), 60 deletions(-)
--

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

2013-12-17 Thread ecn 
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/190e0b5f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/190e0b5f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/190e0b5f

Branch: refs/heads/master
Commit: 190e0b5f78713639385f4819b7430512661911a8
Parents: 6e641f4 46585ab
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Dec 17 15:04:11 2013 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Dec 17 15:04:11 2013 -0500

--
 .../accumulo/server/master/balancer/DefaultLoadBalancer.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--

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

2013-12-04 Thread ecn 
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/c29df8ef
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c29df8ef
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c29df8ef

Branch: refs/heads/master
Commit: c29df8ef00e0d664e7e9b5f59057fd91788323e7
Parents: 0cecf03 c45b96c
Author: Eric Newton eric.new...@gmail.com
Authored: Wed Dec 4 17:16:07 2013 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Wed Dec 4 17:16:07 2013 -0500

--
 bin/config.sh | 67 +-
 1 file changed, 46 insertions(+), 21 deletions(-)
--

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

2013-11-26 Thread ecn 
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/2e4ce5e5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2e4ce5e5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2e4ce5e5

Branch: refs/heads/master
Commit: 2e4ce5e52558f890cf5a6446f98763ee462ac2b0
Parents: abc3d69 dd55dc7
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Nov 26 11:04:34 2013 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Nov 26 11:04:34 2013 -0500

--

--

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

2013-11-26 Thread ecn 
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/c3befc23
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c3befc23
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c3befc23

Branch: refs/heads/master
Commit: c3befc23db249e784bb533ad26294ecd58f19ea2
Parents: 2e4ce5e 3711f41
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Nov 26 16:06:09 2013 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Nov 26 16:06:09 2013 -0500

--
 .../core/client/mapreduce/RangeInputSplit.java  | 81 ++--
 .../mapreduce/AccumuloInputFormatTest.java  | 18 +++--
 .../accumulo/test/functional/ExamplesIT.java| 27 ---
 3 files changed, 70 insertions(+), 56 deletions(-)
--

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

2013-11-07 Thread ecn 
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/0a0ab325
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0a0ab325
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0a0ab325

Branch: refs/heads/master
Commit: 0a0ab3250ecadd29400c8a4642761a4bdcd0d3e0
Parents: 31c8b5a b0d056e
Author: Eric Newton eric.new...@gmail.com
Authored: Thu Nov 7 13:49:57 2013 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Thu Nov 7 13:49:57 2013 -0500

--
 .../core/client/impl/ConditionalWriterImpl.java |  3 ++-
 .../accumulo/test/randomwalk/conditional/Transfer.java  | 12 +---
 2 files changed, 11 insertions(+), 4 deletions(-)
--