You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2014/10/04 02:28:26 UTC

[5/5] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/phoenix

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/phoenix


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/cd8c6b87
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/cd8c6b87
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/cd8c6b87

Branch: refs/heads/master
Commit: cd8c6b877bca5b7405870d6688c3c8054e2d17f3
Parents: d018cc1 051e408
Author: James Taylor <jt...@salesforce.com>
Authored: Fri Oct 3 17:33:33 2014 -0700
Committer: James Taylor <jt...@salesforce.com>
Committed: Fri Oct 3 17:33:33 2014 -0700

----------------------------------------------------------------------
 .../phoenix/cache/aggcache/SpillFile.java       | 42 +++++++++++---------
 .../phoenix/cache/aggcache/SpillManager.java    |  6 ++-
 2 files changed, 28 insertions(+), 20 deletions(-)
----------------------------------------------------------------------