Merge remote-tracking branch 'remotes/origin/sprint-3' into ignite-release-test-no-mod
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/60da391c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/60da391c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/60da391c Branch: refs/heads/ignite-tc-jclient Commit: 60da391c93f9534227b3e36b3b42b908bf120e48 Parents: 87ddfb8 50fc5a9 Author: avinogradov <avinogra...@gridgain.com> Authored: Wed Mar 25 19:49:34 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Wed Mar 25 19:49:34 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 ++--- .../protocols/http/jetty/GridJettyRestHandler.java | 6 ++++++ modules/yardstick/config/ignite-base-config.xml | 2 ++ 12 files changed, 38 insertions(+), 27 deletions(-) ----------------------------------------------------------------------
