Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into master-main
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ba677cc9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ba677cc9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ba677cc9 Branch: refs/heads/ignite-1786 Commit: ba677cc9717ea5566b0467dd2862e4b588cbdabc Parents: c09d61a 4e108ad Author: Denis Magda <[email protected]> Authored: Wed Mar 2 13:07:12 2016 +0300 Committer: Denis Magda <[email protected]> Committed: Wed Mar 2 13:07:12 2016 +0300 ---------------------------------------------------------------------- .../processors/query/h2/IgniteH2Indexing.java | 8 ++ .../cache/CacheQueryNewClientSelfTest.java | 43 +++++---- .../Apache.Ignite.Core.Tests.csproj | 1 + .../ProjectFilesTest.cs | 94 ++++++++++++++++++++ modules/zookeeper/pom.xml | 50 ++++++++++- .../tcp/ipfinder/zk/ZookeeperIpFinderTest.java | 24 ++--- 6 files changed, 191 insertions(+), 29 deletions(-) ----------------------------------------------------------------------
