Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bbdb2024 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bbdb2024 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bbdb2024 Branch: refs/heads/ignite-1.5.1-2 Commit: bbdb20248f606f4b5e9da709d54027a7158b6ea3 Parents: 627134b 3aa6f82 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Tue Dec 22 11:29:06 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Tue Dec 22 11:29:06 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/IgniteCacheProxy.java | 3 +-- .../visor/cache/VisorCacheStoreConfiguration.java | 13 ++++++++++++- .../visor/commands/cache/VisorCacheCommand.scala | 1 + .../yardstick/config/benchmark-multicast.properties | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
