[2/2] git commit: Merge branch '1.6.1-SNAPSHOT'

[billie]

Merge branch '1.6.1-SNAPSHOT'

Conflicts:
        test/src/test/java/org/apache/accumulo/test/functional/BinaryIT.java


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

Branch: refs/heads/master
Commit: 4a4f5463cf2859773326c0db35386f7f63e16c53
Parents: 91186bf 4135e4f
Author: Billie Rinaldi <billie.rina...@gmail.com>
Authored: Thu Aug 28 08:03:06 2014 -0700
Committer: Billie Rinaldi <billie.rina...@gmail.com>
Committed: Thu Aug 28 08:03:06 2014 -0700

----------------------------------------------------------------------
 .../apache/accumulo/test/ConditionalWriterIT.java    |  9 +++++++--
 .../accumulo/test/MultiTableBatchWriterIT.java       |  2 +-
 .../test/functional/AccumuloInputFormatIT.java       | 15 +++++++++------
 .../apache/accumulo/test/functional/BinaryIT.java    | 15 ++++++++++-----
 .../accumulo/test/functional/LogicalTimeIT.java      |  2 +-
 .../apache/accumulo/test/functional/SimpleMacIT.java |  1 +
 6 files changed, 29 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4a4f5463/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4a4f5463/test/src/test/java/org/apache/accumulo/test/functional/BinaryIT.java
----------------------------------------------------------------------
diff --cc test/src/test/java/org/apache/accumulo/test/functional/BinaryIT.java
index ef9034b,9c0edaa..2f79dcb
--- a/test/src/test/java/org/apache/accumulo/test/functional/BinaryIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/BinaryIT.java
@@@ -55,7 -60,7 +60,7 @@@ public class BinaryIT extends SimpleMac
      BatchWriterOpts bwOpts = new BatchWriterOpts();
      ScannerOpts scanOpts = new ScannerOpts();
      TestBinaryRows.Opts opts = new TestBinaryRows.Opts();
-     opts.setTableName("bt");
 -    opts.tableName = tableName;
++    opts.setTableName(tableName);
      opts.start = 0;
      opts.num = 100000;
      opts.mode = "ingest";