[6/6] accumulo git commit: Merge branch '1.7'

[ctubbsii]

Merge branch '1.7'

Conflicts:
        
server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java


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

Branch: refs/heads/master
Commit: 93f285ee4312780a0a95f0f81dd475212f640f60
Parents: f777783 21059c5
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Tue Jun 9 19:04:34 2015 -0400
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Tue Jun 9 19:04:34 2015 -0400

----------------------------------------------------------------------
 .../org/apache/accumulo/master/tableOps/CreateImportDir.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------