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

2014-03-14 Thread ecn 
Merge branch '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/2610f66e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2610f66e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2610f66e

Branch: refs/heads/master
Commit: 2610f66e500ee0f4cd523842503ec66bf7e1cee3
Parents: 20375b6 ae75062
Author: Eric Newton eric.new...@gmail.com
Authored: Fri Mar 14 12:55:47 2014 -0400
Committer: Eric Newton eric.new...@gmail.com
Committed: Fri Mar 14 12:55:47 2014 -0400

--
 .../org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java   | 3 +++
 1 file changed, 3 insertions(+)
--

[2/5] git commit: Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT

2014-02-20 Thread ecn 
Merge branch '1.6.0-SNAPSHOT' of 
https://git-wip-us.apache.org/repos/asf/accumulo into 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/cfced4cf
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cfced4cf
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cfced4cf

Branch: refs/heads/master
Commit: cfced4cf6e48a4f36a4e38404c1ceeef3547baa3
Parents: 0b0ef70 494d694
Author: Eric Newton eric.new...@gmail.com
Authored: Wed Feb 19 17:25:03 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Wed Feb 19 17:25:03 2014 -0500

--
 .../apache/accumulo/core/client/Instance.java   | 10 -
 .../server/master/state/ClosableIterator.java   | 23 
 .../server/master/state/MetaDataStateStore.java |  3 +--
 .../master/state/MetaDataTableScanner.java  |  2 +-
 .../master/state/RootTabletStateStore.java  |  4 +---
 .../server/master/state/TabletStateStore.java   |  3 +--
 .../master/state/ZooTabletStateStore.java   |  8 +--
 .../server/watcher/MonitorLog4jWatcher.java | 10 ++---
 .../server/zookeeper/DistributedWorkQueue.java  |  2 +-
 .../accumulo/master/TabletGroupWatcher.java | 15 -
 10 files changed, 54 insertions(+), 26 deletions(-)
--

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

2014-02-18 Thread ecn 
Merge branch '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/9b7f1894
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9b7f1894
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9b7f1894

Branch: refs/heads/master
Commit: 9b7f1894e4b73e8541d6b633f86d516ccbae4772
Parents: 9754322 b0a1f6d
Author: Eric Newton eric.new...@gmail.com
Authored: Fri Feb 14 13:07:19 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Fri Feb 14 13:07:19 2014 -0500

--
 .../org/apache/accumulo/test/functional/GarbageCollectorIT.java | 1 -
 1 file changed, 1 deletion(-)
--

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

2013-12-17 Thread ecn 
Merge branch '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/5ac7498c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5ac7498c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5ac7498c

Branch: refs/heads/master
Commit: 5ac7498c0fd654f71159bd493136fa188ce50404
Parents: b9b1596 741c83c
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Dec 17 15:06:21 2013 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Dec 17 15:06:21 2013 -0500

--
 .../master/balancer/DefaultLoadBalancer.java|  3 +-
 .../master/state/MetaDataTableScanner.java  |  1 +
 .../test/functional/MasterAssignmentIT.java | 88 
 3 files changed, 91 insertions(+), 1 deletion(-)
--