Merge commit 'refs/pull/374/head' of github.com:apache/apex-malhar
Project: http://git-wip-us.apache.org/repos/asf/apex-malhar/repo Commit: http://git-wip-us.apache.org/repos/asf/apex-malhar/commit/255bc11c Tree: http://git-wip-us.apache.org/repos/asf/apex-malhar/tree/255bc11c Diff: http://git-wip-us.apache.org/repos/asf/apex-malhar/diff/255bc11c Branch: refs/heads/master Commit: 255bc11c536a4feb5ecdf889f9ffe23c6780c059 Parents: 1700725 777d47d Author: David Yan <[email protected]> Authored: Mon Aug 22 16:19:55 2016 -0700 Committer: David Yan <[email protected]> Committed: Mon Aug 22 16:19:55 2016 -0700 ---------------------------------------------------------------------- .../state/spillable/TimeBasedPriorityQueue.java | 13 +++++++-- .../SpillableByteArrayListMultimapImplTest.java | 30 ++++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
