You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/08/21 05:51:11 UTC

[6/6] incubator-ignite git commit: Merge branches 'ignite-843' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-843

Merge branches 'ignite-843' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-843

Conflicts:
	pom.xml


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/885a0225
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/885a0225
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/885a0225

Branch: refs/heads/ignite-843
Commit: 885a022527f70c58057fdd4cb41367a746a23fad
Parents: 11461c2 d69e778
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Aug 21 10:51:22 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Aug 21 10:51:22 2015 +0700

----------------------------------------------------------------------
 .../internal/interop/InteropIgnition.java       |  55 ---
 .../internal/interop/InteropProcessor.java      |  12 -
 .../util/nio/ssl/BlockingSslHandler.java        |   2 +-
 .../ignite/testframework/GridTestUtils.java     |   2 +-
 .../query/IgniteSqlSplitterSelfTest.java        | 123 ++++--
 modules/zookeeper/pom.xml                       |  89 +++++
 .../zk/TcpDiscoveryZookeeperIpFinder.java       | 350 +++++++++++++++++
 .../tcp/ipfinder/zk/ZookeeperIpFinderTest.java  | 390 +++++++++++++++++++
 pom.xml                                         |   1 +
 9 files changed, 925 insertions(+), 99 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/885a0225/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 0098fe9,fa3eaa4..7df4d66
--- a/pom.xml
+++ b/pom.xml
@@@ -76,7 -75,7 +76,8 @@@
          <module>modules/kafka</module>
          <module>modules/yarn</module>
          <module>modules/jms11</module>
 +        <module>modules/json</module>
+         <module>modules/zookeeper</module>
      </modules>
  
      <profiles>