ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [17/17] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-237
Date Wed, 25 Feb 2015 08:32:23 GMT
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-237


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

Branch: refs/heads/ignite-237
Commit: 7f1cffbb3a174a0c1f03c6e0b6b620f58c414e4d
Parents: e8ff779 98f177f
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Wed Feb 25 11:30:26 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Wed Feb 25 11:30:26 2015 +0300

----------------------------------------------------------------------
 .../datagrid/CacheContinuousQueryExample.java   |   6 +-
 .../ignite/codegen/MessageCodeGenerator.java    |  28 +-
 .../cache/store/jdbc/CacheJdbcPojoStore.java    |  28 +-
 .../processors/cache/GridCacheMapEntry.java     | 562 +++++++++++--------
 .../GridDistributedTxRemoteAdapter.java         |  66 +--
 .../dht/atomic/GridDhtAtomicCache.java          |  44 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |  84 +--
 .../distributed/near/GridNearAtomicCache.java   |   3 -
 .../cache/transactions/IgniteTxAdapter.java     |  58 +-
 .../cache/transactions/IgniteTxEntry.java       |  12 +-
 .../transactions/IgniteTxLocalAdapter.java      |  48 +-
 .../cache/version/GridCacheVersion.java         |   3 +-
 .../GridCacheVersionConflictContext.java        |  35 +-
 .../cache/version/GridCacheVersionEx.java       |   2 +-
 .../dr/GridDrDataLoadCacheUpdater.java          |   6 +-
 .../core/src/main/resources/ignite.properties   |   2 +-
 .../near/IgniteCacheNearReadCommittedTest.java  |   3 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |   3 +-
 .../client/hadoop/GridHadoopClientProtocol.java |   3 +-
 .../hadoop/GridHadoopDefaultJobInfo.java        |   5 +-
 20 files changed, 560 insertions(+), 441 deletions(-)
----------------------------------------------------------------------



Mime
View raw message