Merge branch '42' this fixes one of common unit test race conditions
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/2d8ffba3 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/2d8ffba3 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/2d8ffba3 Branch: refs/heads/master Commit: 2d8ffba391fa9d44d7e48e46f60fd05be9dd6d39 Parents: 0dabbbf 54efa1a Author: aadamchik <[email protected]> Authored: Wed Dec 3 17:40:32 2014 +0300 Committer: aadamchik <[email protected]> Committed: Wed Dec 3 17:42:34 2014 +0300 ---------------------------------------------------------------------- ...ataContextDisjointByIdPrefetch_ExtrasIT.java | 154 ++++++------------- 1 file changed, 46 insertions(+), 108 deletions(-) ----------------------------------------------------------------------
