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/07/07 12:13:38 UTC

[1/6] 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-10052 3889277a6 -> fe12ad37f


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-10052
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(-)
----------------------------------------------------------------------



[6/6] incubator-ignite git commit: Merge branch 'ignite-gg-10123' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10052

Posted by sb...@apache.org.
Merge branch 'ignite-gg-10123' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10052


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

Branch: refs/heads/ignite-gg-10052
Commit: fe12ad37f43ab141367a167e9946316f8055d231
Parents: 3889277 f50157c
Author: iveselovskiy <iv...@gridgain.com>
Authored: Wed Jun 17 15:03:42 2015 +0300
Committer: iveselovskiy <iv...@gridgain.com>
Committed: Wed Jun 17 15:03:42 2015 +0300

----------------------------------------------------------------------

----------------------------------------------------------------------



[5/6] incubator-ignite git commit: Merge branch 'ignite-gg-10423' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10123

Posted by sb...@apache.org.
Merge branch 'ignite-gg-10423' 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/f50157c8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f50157c8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f50157c8

Branch: refs/heads/ignite-gg-10052
Commit: f50157c8d3179fa7965064465e81b0346a997e0c
Parents: b94ad86 893bef2
Author: iveselovskiy <iv...@gridgain.com>
Authored: Fri Jun 12 18:42:26 2015 +0300
Committer: iveselovskiy <iv...@gridgain.com>
Committed: Fri Jun 12 18:42:26 2015 +0300

----------------------------------------------------------------------
 .../cache/GridCacheSwapReloadSelfTest.java      | 21 ++++++++++++++++----
 .../cache/IgniteCachePeekModesAbstractTest.java |  4 ++--
 2 files changed, 19 insertions(+), 6 deletions(-)
----------------------------------------------------------------------



[3/6] incubator-ignite git commit: Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10423

Posted by sb...@apache.org.
Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10423


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

Branch: refs/heads/ignite-gg-10052
Commit: 893bef2cf381586ff3b319a3dfedfb24fe8b8cbf
Parents: 3e74a6d c233aa2
Author: iveselovskiy <iv...@gridgain.com>
Authored: Fri Jun 12 15:53:51 2015 +0300
Committer: iveselovskiy <iv...@gridgain.com>
Committed: Fri Jun 12 15:53:51 2015 +0300

----------------------------------------------------------------------
 .../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/transactions/IgniteTxHandler.java     |  3 -
 .../messages/GridQueryNextPageResponse.java     |  1 +
 .../DataStreamProcessorSelfTest.java            |  3 +-
 .../testsuites/IgniteKernalSelfTestSuite.java   |  2 +-
 25 files changed, 351 insertions(+), 439 deletions(-)
----------------------------------------------------------------------



[2/6] incubator-ignite git commit: Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10423

Posted by sb...@apache.org.
Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10423


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

Branch: refs/heads/ignite-gg-10052
Commit: 3e74a6da3760776fbe58970e6196e72adad39d22
Parents: 6e6a8fb b087aca
Author: iveselovskiy <iv...@gridgain.com>
Authored: Fri Jun 12 11:33:15 2015 +0300
Committer: iveselovskiy <iv...@gridgain.com>
Committed: Fri Jun 12 11:33:15 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheProcessor.java    |  17 ++
 .../cache/query/GridCacheQueryManager.java      |   5 +-
 .../continuous/GridContinuousProcessor.java     |  15 +-
 .../util/ipc/shmem/IpcSharedMemoryUtils.java    |   4 +-
 ...teStartCacheInTransactionAtomicSelfTest.java |  32 +++
 .../IgniteStartCacheInTransactionSelfTest.java  | 254 +++++++++++++++++++
 .../testsuites/IgniteCacheTestSuite4.java       |   3 +
 modules/spark/pom.xml                           |  38 ++-
 8 files changed, 337 insertions(+), 31 deletions(-)
----------------------------------------------------------------------



[4/6] 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-10052
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(-)
----------------------------------------------------------------------