ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ivasilin...@apache.org
Subject [9/9] incubator-ignite git commit: Merge branch 'ignite-sprint-7' into ignite-964-1
Date Mon, 06 Jul 2015 07:24:07 GMT
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 <ivasilinets@gridgain.com>
Authored: Mon Jul 6 10:23:38 2015 +0300
Committer: ivasilinets <ivasilinets@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>


Mime
View raw message