You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vk...@apache.org on 2015/09/04 21:41:32 UTC
[07/19] ignite git commit: Merge branches 'ignite-884' and
'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-884
Merge branches 'ignite-884' and 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-884
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e0110110
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e0110110
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e0110110
Branch: refs/heads/ignite-884
Commit: e0110110d7d68860cede0e5161c1a9259e825628
Parents: edc42c4 af829d0
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Wed Jun 17 18:43:20 2015 -0700
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Wed Jun 17 18:43:20 2015 -0700
----------------------------------------------------------------------
examples/pom.xml | 2 +-
modules/aop/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
modules/clients/pom.xml | 2 +-
modules/cloud/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
.../apache/ignite/internal/IgniteKernal.java | 13 +-
.../client/GridClientConfiguration.java | 2 +-
.../GridClientOptimizedMarshaller.java | 21 ++
.../impl/GridTcpRouterNioListenerAdapter.java | 2 +-
.../processors/cache/GridCacheAdapter.java | 4 +
.../processors/cache/IgniteCacheProxy.java | 7 +
.../dht/GridDhtTransactionalCacheAdapter.java | 2 +-
.../cache/transactions/IgniteTxHandler.java | 2 +-
.../transactions/IgniteTxLocalAdapter.java | 12 +-
.../dr/IgniteDrDataStreamerCacheUpdater.java | 7 +-
.../rest/protocols/tcp/GridTcpRestProtocol.java | 3 +-
.../ignite/internal/util/IgniteUtils.java | 21 ++
.../core/src/main/resources/ignite.properties | 2 +-
.../CacheStoreUsageMultinodeAbstractTest.java | 305 +++++++++++++++++++
...eUsageMultinodeDynamicStartAbstractTest.java | 169 ++++++++++
...oreUsageMultinodeDynamicStartAtomicTest.java | 32 ++
...heStoreUsageMultinodeDynamicStartTxTest.java | 32 ++
...reUsageMultinodeStaticStartAbstractTest.java | 158 ++++++++++
...toreUsageMultinodeStaticStartAtomicTest.java | 32 ++
...cheStoreUsageMultinodeStaticStartTxTest.java | 32 ++
.../testsuites/IgniteCacheTestSuite4.java | 4 +
modules/extdata/p2p/pom.xml | 2 +-
modules/extdata/uri/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/jta/pom.xml | 2 +-
modules/log4j/pom.xml | 2 +-
modules/mesos/pom.xml | 2 +-
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/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 +-
pom.xml | 2 +-
57 files changed, 875 insertions(+), 59 deletions(-)
----------------------------------------------------------------------