Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/flink into asf_master
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/5c7243c1 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/5c7243c1 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/5c7243c1 Branch: refs/heads/master Commit: 5c7243c1e2ad798baa8793197550c2446896ff3c Parents: 49a8680 9cdd2b3 Author: Henry Saputra <henry.sapu...@gmail.com> Authored: Thu Jan 22 15:22:08 2015 -0800 Committer: Henry Saputra <henry.sapu...@gmail.com> Committed: Thu Jan 22 15:22:08 2015 -0800 ---------------------------------------------------------------------- .../operators/sort/LargeRecordHandler.java | 12 +- .../flink/runtime/jobmanager/JobManager.scala | 3 + .../flink/runtime/taskmanager/TaskManager.scala | 2 + .../sort/ExternalSortLargeRecordsITCase.java | 174 +++++++++---------- 4 files changed, 96 insertions(+), 95 deletions(-) ----------------------------------------------------------------------
