Merge branch 'master' into CURATOR-96
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/568c6997 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/568c6997 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/568c6997 Branch: refs/heads/master Commit: 568c69979b17b165343228814fc366c001294303 Parents: 426db3d d19aff7 Author: randgalt <randg...@apache.org> Authored: Sun Mar 30 13:31:42 2014 -0500 Committer: randgalt <randg...@apache.org> Committed: Sun Mar 30 13:31:42 2014 -0500 ---------------------------------------------------------------------- .../curator/framework/recipes/queue/QueueSharder.java | 13 +++++-------- .../framework/recipes/queue/TestQueueSharder.java | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/568c6997/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestQueueSharder.java ----------------------------------------------------------------------