You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/08/21 13:05:44 UTC
[3/7] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-843' into ignite-843
Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/eae81c05
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/eae81c05
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/eae81c05
Branch: refs/heads/ignite-843
Commit: eae81c0510eabee6e75664367ab31601a7ab727a
Parents: 1234196 885a022
Author: Andrey <an...@gridgain.com>
Authored: Fri Aug 21 10:54:19 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Aug 21 10:54:19 2015 +0700
----------------------------------------------------------------------
.../main/js/controllers/models/metadata.json | 2 +-
.../src/main/js/public/stylesheets/style.scss | 11 +-
.../src/main/js/views/includes/controls.jade | 93 +++--
.../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 +
10 files changed, 982 insertions(+), 81 deletions(-)
----------------------------------------------------------------------