accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject [5/5] git commit: Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT'
Date Sat, 01 Feb 2014 02:31:37 GMT
Merge remote-tracking branch 'origin/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/6569b2c9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6569b2c9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6569b2c9

Branch: refs/heads/master
Commit: 6569b2c94260349d82a843e4ddfe154a155d9813
Parents: 7f5bd5f b1f0336
Author: John Vines <vines@apache.org>
Authored: Fri Jan 31 21:31:28 2014 -0500
Committer: John Vines <vines@apache.org>
Committed: Fri Jan 31 21:31:28 2014 -0500

----------------------------------------------------------------------
 .../impl/MiniAccumuloConfigImpl.java            |   8 +-
 .../accumulo/test/functional/AbstractMacIT.java |  10 +-
 .../test/functional/BatchWriterFlushIT.java     |   2 +-
 .../accumulo/test/functional/BinaryIT.java      |   4 +-
 .../accumulo/test/functional/BloomFilterIT.java |   2 +-
 .../apache/accumulo/test/functional/BulkIT.java |  12 +-
 .../functional/BulkSplitOptimizationIT.java     |   2 +-
 .../test/functional/ConfigurableMacIT.java      |   2 +-
 .../accumulo/test/functional/ExamplesIT.java    | 205 +++++++++++++------
 .../test/functional/GarbageCollectorIT.java     |   2 +-
 .../test/functional/MasterFailoverIT.java       |   2 +-
 .../accumulo/test/functional/ReadWriteIT.java   |   2 +-
 .../accumulo/test/functional/RestartIT.java     |   2 +-
 .../functional/SimpleBalancerFairnessIT.java    |   2 +-
 .../accumulo/test/functional/SimpleMacIT.java   |   2 +-
 .../apache/accumulo/test/functional/SslIT.java  |   4 +-
 .../test/functional/SslWithClientAuthIT.java    |   2 +-
 .../accumulo/test/functional/StartIT.java       |   2 +-
 18 files changed, 170 insertions(+), 97 deletions(-)
----------------------------------------------------------------------



Mime
View raw message