You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/12/08 13:28:37 UTC
[14/14] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/63f00fb4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/63f00fb4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/63f00fb4
Branch: refs/heads/ignite-1537
Commit: 63f00fb483412232c6758c4ef6f09edbd5a3148c
Parents: 6f38064 67ebd02
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 8 15:28:02 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 8 15:28:02 2015 +0300
----------------------------------------------------------------------
examples/pom.xml | 2 +-
examples/schema-import/pom.xml | 2 +-
modules/aop/pom.xml | 2 +-
modules/apache-license-gen/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
modules/camel/pom.xml | 2 +-
modules/clients/pom.xml | 2 +-
modules/cloud/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
.../ignite/codegen/MessageCodeGenerator.java | 6 +-
modules/core/pom.xml | 2 +-
.../configuration/CacheConfiguration.java | 34 +++-
.../communication/GridIoMessageFactory.java | 8 +-
.../internal/util/GridMessageCollection.java | 160 +++++++++++++++++++
.../internal/util/UUIDCollectionMessage.java | 42 ++++-
.../optimized/OptimizedMarshallerUtils.java | 16 +-
.../core/src/main/resources/ignite.properties | 2 +-
...eAtomicEntryProcessorDeploymentSelfTest.java | 6 +-
.../DataStreamProcessorSelfTest.java | 25 +--
.../config/GridTestProperties.java | 3 +
.../IgniteBinaryObjectsCacheTestSuite3.java | 2 +
.../testsuites/IgniteUtilSelfTestSuite.java | 2 +
.../ignite/util/GridMessageCollectionTest.java | 105 ++++++++++++
modules/extdata/p2p/pom.xml | 2 +-
.../extdata/uri/modules/uri-dependency/pom.xml | 2 +-
modules/extdata/uri/pom.xml | 2 +-
modules/flume/pom.xml | 2 +-
modules/gce/pom.xml | 2 +-
modules/geospatial/pom.xml | 2 +-
modules/hadoop/pom.xml | 2 +-
modules/hibernate/pom.xml | 2 +-
modules/indexing/pom.xml | 2 +-
...cheDuplicateEntityConfigurationSelfTest.java | 126 +++++++++++++++
.../IgniteCacheQuerySelfTestSuite.java | 4 +
modules/jcl/pom.xml | 2 +-
modules/jms11/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
modules/kafka/pom.xml | 2 +-
modules/log4j/pom.xml | 2 +-
modules/log4j2/pom.xml | 2 +-
modules/mesos/pom.xml | 2 +-
modules/mqtt/pom.xml | 2 +-
modules/osgi-karaf/pom.xml | 5 +-
modules/osgi-paxlogging/pom.xml | 6 +-
modules/osgi/pom.xml | 5 +-
modules/platforms/cpp/common/configure.ac | 2 +-
modules/platforms/cpp/core-test/configure.ac | 2 +-
modules/platforms/cpp/core/configure.ac | 2 +-
modules/platforms/cpp/examples/configure.ac | 2 +-
modules/platforms/cpp/ignite/configure.ac | 2 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../Apache.Ignite.Core.Tests/EventsTest.cs | 3 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../Apache.Ignite/Properties/AssemblyInfo.cs | 4 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../Properties/AssemblyInfo.cs | 4 +-
modules/rest-http/pom.xml | 2 +-
modules/scalar-2.10/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
modules/schedule/pom.xml | 2 +-
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spark-2.10/pom.xml | 2 +-
modules/spark/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
modules/twitter/pom.xml | 2 +-
modules/urideploy/pom.xml | 2 +-
modules/visor-console-2.10/pom.xml | 2 +-
modules/visor-console/pom.xml | 2 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
modules/yardstick/pom.xml | 2 +-
.../yardstick/cache/IgnitePutTxBenchmark.java | 26 ++-
modules/yarn/pom.xml | 2 +-
.../apache/ignite/yarn/utils/package-info.java | 22 +++
modules/zookeeper/pom.xml | 2 +-
pom.xml | 6 +-
81 files changed, 636 insertions(+), 110 deletions(-)
----------------------------------------------------------------------