Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0551155b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0551155b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0551155b Branch: refs/heads/ignite-104 Commit: 0551155bcdab86ed3409f945db15ade564a167e0 Parents: 2918882 c087be2 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Tue Aug 4 18:45:49 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Tue Aug 4 18:45:49 2015 -0700 ---------------------------------------------------------------------- .../query/h2/twostep/GridMergeIndexUnsorted.java | 8 +------- .../processors/query/h2/twostep/GridMergeTable.java | 13 +++++++------ 2 files changed, 8 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
