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

2014-03-25 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/36745b5a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/36745b5a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/36745b5a

Branch: refs/heads/master
Commit: 36745b5a4a351e503ad27a7d1654fb76c2bd86e3
Parents: eb72c5b f3f5480
Author: Josh Elser els...@apache.org
Authored: Tue Mar 25 17:34:52 2014 -0700
Committer: Josh Elser els...@apache.org
Committed: Tue Mar 25 17:34:52 2014 -0700

--
 .../core/file/rfile/bcfile/PrintInfo.java   |   1 +
 .../CachingHDFSSecretKeyEncryptionStrategy.java |   3 +-
 .../NonCachingSecretKeyEncryptionStrategy.java  |   2 +
 .../apache/accumulo/server/util/FileUtil.java   |  25 +-
 .../accumulo/server/util/FileUtilTest.java  | 235 +++
 5 files changed, 253 insertions(+), 13 deletions(-)
--

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

2014-01-15 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/9338b522
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9338b522
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9338b522

Branch: refs/heads/master
Commit: 9338b522f58d48d1d656a182e4324dccd2545173
Parents: e1ed7a4 592d7d6
Author: Bill Havanki bhava...@cloudera.com
Authored: Wed Jan 15 16:09:43 2014 -0500
Committer: Bill Havanki bhava...@cloudera.com
Committed: Wed Jan 15 16:09:43 2014 -0500

--
 .../apache/accumulo/server/fs/ViewFSUtils.java  |  59 ++-
 .../accumulo/server/fs/VolumeManagerImpl.java   |   8 ++
 .../accumulo/server/util/MetadataTableUtil.java |  10 +-
 .../accumulo/server/fs/ViewFSUtilsTest.java | 100 +++
 .../accumulo/master/tableOps/BulkImport.java|   2 +-
 5 files changed, 168 insertions(+), 11 deletions(-)
--

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

2014-01-13 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/7345b833
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7345b833
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7345b833

Branch: refs/heads/master
Commit: 7345b83330e92bac51fcf891df2e27112011a414
Parents: 4cffb74 9a81ca2
Author: Josh Elser els...@apache.org
Authored: Mon Jan 13 12:46:42 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Mon Jan 13 12:46:42 2014 -0500

--
 .../minicluster/MiniAccumuloCluster.java|   5 +-
 .../monitor/servlets/DefaultServlet.java|   2 +-
 .../test/functional/GarbageCollectorIT.java | 122 +++
 3 files changed, 75 insertions(+), 54 deletions(-)
--

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

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

Branch: refs/heads/master
Commit: bdac06f6560fd575a33c827c0fc8d9519862004a
Parents: 403815f a425f6a
Author: Mike Drob md...@cloudera.com
Authored: Thu Dec 12 10:58:48 2013 -0800
Committer: Mike Drob md...@cloudera.com
Committed: Thu Dec 12 10:58:48 2013 -0800

--
 .../java/org/apache/accumulo/master/Master.java | 11 --
 .../accumulo/master/tableOps/CompactRange.java  | 15 +---
 .../accumulo/test/functional/MetadataIT.java| 38 
 3 files changed, 57 insertions(+), 7 deletions(-)
--