Repository: incubator-ignite Updated Branches: refs/heads/ignite-23 a837fe1e3 -> 2b679829e
Merge branches 'ignite-709_2' and 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-709_2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5da1bd7f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5da1bd7f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5da1bd7f Branch: refs/heads/ignite-23 Commit: 5da1bd7f0df240656039465a02d94b7c05c34dee Parents: f0b6b6e 02f3a12 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Fri May 22 14:40:48 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Fri May 22 14:40:48 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 16 +++- .../config/benchmark-client-mode.properties | 89 ++++++++++++++++++++ 2 files changed, 101 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
