You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2014/12/10 16:59:23 UTC
[14/17] incubator-ignite git commit: Merge branches 'ignite-qry' and
'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into
ignite-qry
Merge branches 'ignite-qry' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-qry
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2a605d1a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2a605d1a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2a605d1a
Branch: refs/heads/master
Commit: 2a605d1ad3cde56b7963c1e50809c6f47ac1e355
Parents: 59204a5 20872dc
Author: S.Vladykin <sv...@gridgain.com>
Authored: Wed Dec 10 12:07:57 2014 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Wed Dec 10 12:07:57 2014 +0300
----------------------------------------------------------------------
config/hadoop/default-config.xml | 6 +-
.../fs/IgniteFsGroupDataBlocksKeyMapper.java | 2 +-
.../ignite/fs/mapreduce/IgniteFsTask.java | 2 +-
.../processors/cache/GridCacheMapEntry.java | 40 ++++--
.../processors/cache/GridCacheSwapManager.java | 14 +-
.../distributed/dht/GridDhtLocalPartition.java | 32 +++++
.../distributed/dht/GridDhtLockFuture.java | 3 +
.../distributed/dht/GridDhtLockResponse.java | 12 ++
.../dht/GridDhtTransactionalCacheAdapter.java | 2 +
.../colocated/GridDhtDetachedCacheEntry.java | 5 +
.../dht/preloader/GridDhtPreloader.java | 10 +-
.../cache/GridCacheOffheapUpdateSelfTest.java | 130 +++++++++++++++++++
...IpcEndpointRegistrationAbstractSelfTest.java | 4 +-
.../bamboo/GridDataGridTestSuite.java | 1 +
14 files changed, 235 insertions(+), 28 deletions(-)
----------------------------------------------------------------------