You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by iv...@apache.org on 2015/07/06 09:24:07 UTC
[9/9] incubator-ignite git commit: Merge branch 'ignite-sprint-7'
into ignite-964-1
Merge branch 'ignite-sprint-7' into ignite-964-1
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/dc75dd94
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dc75dd94
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dc75dd94
Branch: refs/heads/ignite-964-1
Commit: dc75dd94fc09fbe133520bbbf7799a72ad4a1a2d
Parents: d63feba 334fee9
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Jul 6 10:23:38 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Jul 6 10:23:38 2015 +0300
----------------------------------------------------------------------
bin/ignite.bat | 8 +-
bin/ignite.sh | 6 +-
bin/include/parseargs.bat | 1 +
bin/include/parseargs.sh | 3 +
.../startup/cmdline/CommandLineStartup.java | 3 +-
.../startup/cmdline/CommandLineTransformer.java | 9 +
...acheAtomicReplicatedNodeRestartSelfTest.java | 5 +
modules/kafka/pom.xml | 116 ++++++
.../ignite/stream/kafka/KafkaStreamer.java | 220 +++++++++++
.../kafka/IgniteKafkaStreamerSelfTestSuite.java | 37 ++
.../stream/kafka/KafkaEmbeddedBroker.java | 378 +++++++++++++++++++
.../kafka/KafkaIgniteStreamerSelfTest.java | 227 +++++++++++
.../ignite/stream/kafka/SimplePartitioner.java | 53 +++
pom.xml | 1 +
14 files changed, 1063 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc75dd94/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index a821af7,b47d34b..95c69bc
--- a/pom.xml
+++ b/pom.xml
@@@ -70,7 -70,7 +70,8 @@@
<module>modules/gce</module>
<module>modules/cloud</module>
<module>modules/mesos</module>
+ <module>modules/nodejs</module>
+ <module>modules/kafka</module>
</modules>
<profiles>