Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-23
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b29449ea Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b29449ea Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b29449ea Branch: refs/heads/ignite-943 Commit: b29449ea9e5c288864a2556f6f7a7286896fe2ab Parents: 0163cec f2e0fc2 Author: sboikov <sboi...@gridgain.com> Authored: Fri May 22 18:37:01 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri May 22 18:37:01 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 16 +++- .../continuous/CacheContinuousQueryManager.java | 2 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 10 ++- .../spi/discovery/tcp/TcpDiscoverySpi.java | 24 ++++-- .../config/benchmark-client-mode.properties | 89 ++++++++++++++++++++ 5 files changed, 127 insertions(+), 14 deletions(-) ----------------------------------------------------------------------
