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/06/12 17:39:19 UTC
[1/2] incubator-ignite git commit: Merge branch 'ignite-sprint-6' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10123
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-gg-10123 [created] b94ad86f5
Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10123
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/98f01143
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/98f01143
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/98f01143
Branch: refs/heads/ignite-gg-10123
Commit: 98f0114397c96a35565cd48cdc61774e4df097e9
Parents: b76ed93 e188e18
Author: iveselovskiy <iv...@gridgain.com>
Authored: Thu Jun 11 19:52:27 2015 +0300
Committer: iveselovskiy <iv...@gridgain.com>
Committed: Thu Jun 11 19:52:27 2015 +0300
----------------------------------------------------------------------
DEVNOTES.txt | 8 ++++++++
.../org/apache/ignite/internal/IgniteKernal.java | 2 +-
modules/mesos/README.txt | 2 +-
.../org/apache/ignite/mesos/ClusterProperties.java | 15 +++++++++++++++
.../org/apache/ignite/mesos/IgniteScheduler.java | 10 +++++++---
5 files changed, 32 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[2/2] incubator-ignite git commit: Merge branch 'ignite-sprint-6' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10123
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10123
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b94ad86f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b94ad86f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b94ad86f
Branch: refs/heads/ignite-gg-10123
Commit: b94ad86f598c0bac715c09180fec335daf959315
Parents: 98f0114 2707194
Author: iveselovskiy <iv...@gridgain.com>
Authored: Fri Jun 12 18:38:00 2015 +0300
Committer: iveselovskiy <iv...@gridgain.com>
Committed: Fri Jun 12 18:38:00 2015 +0300
----------------------------------------------------------------------
RELEASE_NOTES.txt | 12 +
.../ignite/internal/GridKernalContextImpl.java | 5 +-
.../apache/ignite/internal/IgniteKernal.java | 21 +-
.../internal/MarshallerContextAdapter.java | 18 +-
.../ignite/internal/MarshallerContextImpl.java | 14 +-
.../GridClientOptimizedMarshaller.java | 5 +
.../processors/cache/GridCacheProcessor.java | 17 ++
.../distributed/GridCacheTxRecoveryRequest.java | 26 +-
.../GridCacheTxRecoveryResponse.java | 14 +-
.../distributed/GridDistributedBaseMessage.java | 77 +-----
.../distributed/GridDistributedLockRequest.java | 54 ++--
.../GridDistributedLockResponse.java | 14 +-
.../GridDistributedTxFinishRequest.java | 46 ++--
.../GridDistributedTxPrepareRequest.java | 62 ++---
.../GridDistributedTxPrepareResponse.java | 64 +----
.../GridDistributedUnlockRequest.java | 6 +-
.../distributed/dht/GridDhtLockRequest.java | 72 ++++--
.../distributed/dht/GridDhtLockResponse.java | 18 +-
.../distributed/dht/GridDhtTxFinishRequest.java | 38 +--
.../dht/GridDhtTxPrepareRequest.java | 54 ++--
.../dht/GridDhtTxPrepareResponse.java | 22 +-
.../distributed/dht/GridDhtUnlockRequest.java | 6 +-
.../distributed/near/GridNearLockRequest.java | 58 ++---
.../distributed/near/GridNearLockResponse.java | 26 +-
.../near/GridNearTxFinishRequest.java | 26 +-
.../near/GridNearTxPrepareRequest.java | 50 ++--
.../near/GridNearTxPrepareResponse.java | 46 ++--
.../distributed/near/GridNearUnlockRequest.java | 2 +-
.../cache/query/GridCacheQueryManager.java | 5 +-
.../cache/transactions/IgniteTxHandler.java | 3 -
.../continuous/GridContinuousProcessor.java | 15 +-
.../plugin/IgnitePluginProcessor.java | 16 +-
.../messages/GridQueryNextPageResponse.java | 1 +
.../util/ipc/shmem/IpcSharedMemoryUtils.java | 4 +-
.../cache/GridCachePutAllFailoverSelfTest.java | 5 -
.../IgniteCacheP2pUnmarshallingTxErrorTest.java | 14 +-
...teStartCacheInTransactionAtomicSelfTest.java | 32 +++
.../IgniteStartCacheInTransactionSelfTest.java | 254 +++++++++++++++++++
.../dht/GridCacheColocatedFailoverSelfTest.java | 5 -
.../GridCachePartitionedFailoverSelfTest.java | 5 -
.../GridCacheReplicatedFailoverSelfTest.java | 5 -
.../DataStreamProcessorSelfTest.java | 3 +-
.../marshaller/MarshallerContextTestImpl.java | 18 ++
.../junits/GridTestKernalContext.java | 1 +
.../testsuites/IgniteCacheTestSuite4.java | 3 +
.../testsuites/IgniteKernalSelfTestSuite.java | 2 +-
modules/spark/pom.xml | 38 ++-
.../ignite/tools/classgen/ClassesGenerator.java | 18 +-
48 files changed, 801 insertions(+), 519 deletions(-)
----------------------------------------------------------------------