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

[bhavanki]

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
        test/src/main/java/org/apache/accumulo/test/randomwalk/State.java
        
test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CheckBalance.java


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

Branch: refs/heads/master
Commit: 08a980497297721aa0fefbc6a03023e39871c090
Parents: d5ebc7a 9aa4b70
Author: Bill Havanki <bhava...@cloudera.com>
Authored: Thu Jan 16 15:11:42 2014 -0500
Committer: Bill Havanki <bhava...@cloudera.com>
Committed: Thu Jan 16 15:11:42 2014 -0500

----------------------------------------------------------------------
 .../apache/accumulo/test/randomwalk/State.java  |  8 +++++
 .../randomwalk/concurrent/CheckBalance.java     | 36 +++++++++++++-------
 .../concurrent/ConcurrentFixture.java           |  5 ++-
 3 files changed, 35 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/08a98049/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java
----------------------------------------------------------------------
diff --cc test/src/main/java/org/apache/accumulo/test/randomwalk/State.java
index 38cf8b7,b799d04..f4102ab
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java
@@@ -71,6 -72,10 +71,10 @@@ public class State 
      stateMap.put(key, value);
    }
  
+   public void remove(String key) {
+     stateMap.remove(key);
+   }
 -  
++
    public Object get(String key) {
      if (stateMap.containsKey(key) == false) {
        throw new RuntimeException("State does not contain " + key);
@@@ -93,7 -98,11 +97,11 @@@
    public String getString(String key) {
      return (String) stateMap.get(key);
    }
 -  
 +
+   public Integer getInteger(String key) {
+     return (Integer) stateMap.get(key);
+   }
+ 
    public Long getLong(String key) {
      return (Long) stateMap.get(key);
    }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/08a98049/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CheckBalance.java
----------------------------------------------------------------------