Merge branch 'fluo-762'
Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo/commit/389d0070 Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo/tree/389d0070 Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo/diff/389d0070 Branch: refs/heads/master Commit: 389d00700628f5f3dce4658845896d5c366a33d3 Parents: d99a6e0 2bf94b1 Author: Keith Turner <ktur...@apache.org> Authored: Tue Oct 25 18:18:23 2016 -0400 Committer: Keith Turner <ktur...@apache.org> Committed: Tue Oct 25 18:18:23 2016 -0400 ---------------------------------------------------------------------- .../apache/fluo/integration/impl/CollisionIT.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
