Merge remote-tracking branch 'remotes/origin/sprint-1' 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/80608efc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/80608efc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/80608efc Branch: refs/heads/ignite-sql-tests Commit: 80608efcb396c21337d0e58db9ead8b92c3167e1 Parents: c102312 0497791 Author: sboikov <sboi...@gridgain.com> Authored: Thu Feb 5 12:41:22 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Feb 5 12:41:22 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(-) ----------------------------------------------------------------------
