Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' 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/bac78c95 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bac78c95 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bac78c95 Branch: refs/heads/ignite-23 Commit: bac78c952ca4b96a5568cb4e43757722ec010444 Parents: f0b6b6e 02f3a12 Author: sevdokimov <sevdoki...@gridgain.com> Authored: Fri May 22 15:06:55 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Fri May 22 15:06:55 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 16 +++- .../config/benchmark-client-mode.properties | 89 ++++++++++++++++++++ 2 files changed, 101 insertions(+), 4 deletions(-) ----------------------------------------------------------------------