ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [30/30] ignite git commit: Merge branches 'ignite-843' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843
Date Wed, 23 Sep 2015 15:45:45 GMT
Merge branches 'ignite-843' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite
into ignite-843

Conflicts:
	pom.xml


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

Branch: refs/heads/ignite-843
Commit: 34b373e1f18403e83e90284b393c17981993beea
Parents: 6160ae6 b3bcf4a
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Wed Sep 23 22:45:03 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Wed Sep 23 22:45:03 2015 +0700

----------------------------------------------------------------------
 .../socket/WordsSocketStreamerServer.java       |   5 +-
 .../org/apache/ignite/IgniteAtomicLong.java     |  15 +-
 .../apache/ignite/IgniteAtomicReference.java    |   9 +-
 .../org/apache/ignite/IgniteAtomicSequence.java |   9 +-
 .../org/apache/ignite/IgniteAtomicStamped.java  |  13 +-
 .../org/apache/ignite/IgniteFileSystem.java     |   2 +-
 .../apache/ignite/cache/CacheAtomicityMode.java |  17 +-
 .../configuration/CacheConfiguration.java       |  17 +-
 .../processors/cache/GridCacheAdapter.java      |   8 +-
 .../processors/cache/GridCacheMapEntry.java     |  51 +-
 .../processors/cache/GridCacheProcessor.java    |  10 +-
 .../cache/GridCacheSwapEntryImpl.java           |  31 +-
 .../processors/cache/GridCacheSwapManager.java  |  80 ++-
 .../datastreamer/DataStreamerImpl.java          |   2 -
 .../internal/processors/igfs/IgfsImpl.java      |  87 +--
 .../processors/igfs/IgfsMetaManager.java        | 193 +++++-
 .../ignite/spi/discovery/tcp/ServerImpl.java    |  12 +-
 .../org/apache/ignite/stream/StreamAdapter.java | 104 +++-
 .../stream/StreamMultipleTupleExtractor.java    |  38 ++
 .../stream/StreamSingleTupleExtractor.java      |  40 ++
 .../ignite/stream/StreamTupleExtractor.java     |  20 +-
 .../ignite/stream/socket/SocketStreamer.java    |   3 +-
 .../IgniteCacheEntryListenerAbstractTest.java   |  65 +-
 .../IgniteCachePutRetryAbstractSelfTest.java    |  33 +
 .../processors/igfs/IgfsAbstractSelfTest.java   | 201 ++++--
 .../igfs/IgfsClientCacheSelfTest.java           |  15 +-
 .../igfs/IgfsMetaManagerSelfTest.java           | 106 ++--
 ...lientDiscoverySpiFailureTimeoutSelfTest.java | 118 +++-
 .../tcp/TcpClientDiscoverySpiSelfTest.java      |  13 +-
 .../stream/socket/SocketStreamerSelfTest.java   | 112 +++-
 .../testsuites/IgniteHadoopTestSuite.java       |  19 +-
 .../processors/query/h2/IgniteH2Indexing.java   |  19 +-
 .../query/h2/opt/GridH2AbstractKeyValueRow.java |  54 +-
 .../query/h2/opt/GridH2KeyValueRowOffheap.java  |  11 +-
 .../query/h2/opt/GridH2RowDescriptor.java       |   5 +
 .../processors/query/h2/opt/GridH2Table.java    |  10 +-
 .../cache/CacheIndexStreamerTest.java           |  37 +-
 .../processors/cache/GridCacheSwapSelfTest.java |   4 +-
 .../IgniteCacheWithIndexingTestSuite.java       |   2 +
 modules/mqtt/pom.xml                            | 114 ++++
 .../apache/ignite/stream/mqtt/MqttStreamer.java | 611 +++++++++++++++++++
 .../stream/mqtt/IgniteMqttStreamerTest.java     | 553 +++++++++++++++++
 .../mqtt/IgniteMqttStreamerTestSuite.java       |  34 ++
 .../Apache.Ignite.Core/Impl/IgniteManager.cs    |   2 -
 modules/yardstick/config/ignite-base-config.xml |   2 +-
 pom.xml                                         |   1 +
 46 files changed, 2464 insertions(+), 443 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/34b373e1/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/34b373e1/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 569f5d7,c19a9b7..a76185b
--- 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/mqtt</module>
 +        <module>modules/json</module>
          <module>modules/zookeeper</module>
          <module>modules/platform</module>
      </modules>


Mime
View raw message