ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntikho...@apache.org
Subject [10/10] ignite git commit: Merge branch 'ignite-1.5' into ignite-gg-10837
Date Tue, 22 Dec 2015 15:58:00 GMT
Merge branch 'ignite-1.5' into ignite-gg-10837


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

Branch: refs/heads/ignite-gg-10837
Commit: 972a703b6987e81e9f75dc18fc5b5484f7931f03
Parents: d01589c d95ca2e
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Tue Dec 22 17:39:06 2015 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Tue Dec 22 17:39:06 2015 +0300

----------------------------------------------------------------------
 assembly/dependencies-fabric-lgpl.xml           |  7 +++
 assembly/dependencies-fabric.xml                |  7 +++
 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 +-
 modules/core/pom.xml                            |  2 +-
 .../internal/binary/GridBinaryMarshaller.java   | 10 ++++
 .../binary/CacheObjectBinaryProcessorImpl.java  |  3 ++
 .../core/src/main/resources/ignite.properties   |  2 +-
 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 +-
 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                      |  2 +-
 modules/osgi-paxlogging/pom.xml                 |  2 +-
 modules/osgi/pom.xml                            |  2 +-
 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                  |  6 +--
 .../Properties/AssemblyInfo.cs                  |  6 +--
 .../Properties/AssemblyInfo.cs                  |  6 +--
 .../Properties/AssemblyInfo.cs                  |  6 +--
 .../Apache.Ignite/Properties/AssemblyInfo.cs    |  6 +--
 .../Properties/AssemblyInfo.cs                  |  6 +--
 .../Properties/AssemblyInfo.cs                  |  6 +--
 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 +-
 .../config/benchmark-multicast.properties       |  6 +--
 modules/yardstick/pom.xml                       |  2 +-
 .../cache/IgnitePutTxImplicitBenchmark.java     | 52 ++++++++++++++++++++
 .../cache/IgnitePutTxOffHeapBenchmark.java      |  2 +-
 .../IgnitePutTxOffHeapValuesBenchmark.java      |  2 +-
 modules/yarn/pom.xml                            |  2 +-
 modules/zookeeper/pom.xml                       |  2 +-
 pom.xml                                         |  2 +-
 72 files changed, 162 insertions(+), 83 deletions(-)
----------------------------------------------------------------------



Mime
View raw message