Merge branches 'ignite-58' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-58
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/af95c0ca Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/af95c0ca Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/af95c0ca Branch: refs/heads/ignite-sql-tests Commit: af95c0ca5d247db5349576d507021be2f70bc673 Parents: c102312 0497791 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Thu Feb 5 12:41:09 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Thu Feb 5 12:41:09 2015 +0300 ---------------------------------------------------------------------- .gitignore | 1 + .../ignite/cache/store/CacheLocalStore.java | 31 -------- .../processors/cache/GridCacheStoreManager.java | 1 + .../processors/cache/store/CacheLocalStore.java | 31 ++++++++ .../config/benchmark-multicast.properties | 74 ++++++++++++++++++++ modules/yardstick/config/benchmark.properties | 70 ++++++++++-------- 6 files changed, 149 insertions(+), 59 deletions(-) ----------------------------------------------------------------------
