Merge branches 'ignite-341' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-341
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0a7a684d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0a7a684d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0a7a684d Branch: refs/heads/ignite-494b Commit: 0a7a684dc42beba86cf20dadb76076a9fdc9410d Parents: 385c7de a65cd74 42e467c Author: S.Vladykin <svlady...@gridgain.com> Authored: Wed Mar 25 17:52:46 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Wed Mar 25 17:52:46 2015 +0300 ---------------------------------------------------------------------- .../datagrid/starschema/CacheStarSchemaExample.java | 5 +---- .../datagrid/store/dummy/CacheDummyStoreExample.java | 5 +---- .../store/hibernate/CacheHibernateStoreExample.java | 2 +- .../datagrid/store/jdbc/CacheJdbcStoreExample.java | 2 +- .../misc/schedule/ComputeScheduleExample.java | 2 +- .../java8/misc/schedule/ComputeScheduleExample.java | 6 ++++-- .../GridCacheMixedPartitionExchangeSelfTest.java | 8 ++++++++ .../cache/GridCacheSwapPreloadSelfTest.java | 14 ++++++++------ .../cache/distributed/GridCacheEventAbstractTest.java | 8 +++----- .../testsuites/IgniteCacheFailoverTestSuite.java | 5 ++--- modules/yardstick/config/ignite-base-config.xml | 2 ++ 11 files changed, 32 insertions(+), 27 deletions(-) ----------------------------------------------------------------------
