Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9e0e7f39 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9e0e7f39 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9e0e7f39 Branch: refs/heads/ignite-4587 Commit: 9e0e7f39a91ec6385de23325f4592b0b2fc00483 Parents: d4c5133 5233c60 Author: devozerov <[email protected]> Authored: Fri Apr 14 12:37:45 2017 +0300 Committer: devozerov <[email protected]> Committed: Fri Apr 14 12:37:45 2017 +0300 ---------------------------------------------------------------------- modules/aws/pom.xml | 6 +-- .../configuration/IgniteConfiguration.java | 2 +- .../osgi-karaf/src/main/resources/features.xml | 9 ++--- .../Cache/Affinity/AffinityFunctionTest.cs | 2 +- .../Cache/CacheAbstractTransactionalTest.cs | 1 + .../Cache/CacheMetricsTest.cs | 10 +++-- .../Continuous/ContinuousQueryAbstractTest.cs | 41 +------------------- .../Compute/ComputeApiTest.cs | 8 ++-- .../Apache.Ignite.Core.Tests/EventsTest.cs | 4 +- .../Apache.Ignite.Core.Tests/TestUtils.cs | 21 ++++++++++ parent/pom.xml | 2 +- 11 files changed, 46 insertions(+), 60 deletions(-) ----------------------------------------------------------------------
