Merge branch '3.0' of https://git-wip-us.apache.org/repos/asf/phoenix into 3.0
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/80e218c2 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/80e218c2 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/80e218c2 Branch: refs/heads/3.0 Commit: 80e218c2403bc7f057ea334293cf803306fb304b Parents: 5f6f80b d3e6a9f Author: James Taylor <[email protected]> Authored: Fri Oct 3 20:56:10 2014 -0700 Committer: James Taylor <[email protected]> Committed: Fri Oct 3 20:56:10 2014 -0700 ---------------------------------------------------------------------- .../phoenix/cache/aggcache/SpillFile.java | 42 +++++++++++--------- .../phoenix/cache/aggcache/SpillManager.java | 6 ++- 2 files changed, 28 insertions(+), 20 deletions(-) ----------------------------------------------------------------------
