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

[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");
    }