ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [11/11] ignite git commit: Merge branch 'gridgain-7.6.1'
Date Wed, 08 Jun 2016 12:19:52 GMT
Merge branch 'gridgain-7.6.1'

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java


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

Branch: refs/heads/master
Commit: 61210943c1c627aa31dba6a80531a3fbac70b6dd
Parents: 77793f5 7761e5f
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Wed Jun 8 15:18:29 2016 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Wed Jun 8 15:18:29 2016 +0300

----------------------------------------------------------------------
 .../apache/ignite/IgniteSystemProperties.java   |   3 +
 .../configuration/FileSystemConfiguration.java  |  36 +-
 .../GridCachePartitionExchangeManager.java      |  43 +-
 .../distributed/GridCacheTxRecoveryFuture.java  |  58 +-
 .../GridDhtPartitionsExchangeFuture.java        |  42 +-
 .../cache/transactions/IgniteTxManager.java     |   9 +-
 .../internal/processors/igfs/IgfsAsyncImpl.java |   6 -
 .../processors/igfs/IgfsDataManager.java        |  89 ++-
 .../processors/igfs/IgfsDeleteWorker.java       |  36 --
 .../ignite/internal/processors/igfs/IgfsEx.java |   9 -
 .../internal/processors/igfs/IgfsImpl.java      | 294 +++-------
 .../processors/igfs/IgfsInputStreamImpl.java    |   6 +-
 ...zySecondaryFileSystemPositionedReadable.java |  77 +++
 .../processors/igfs/IgfsMetaManager.java        | 303 +++++-----
 .../igfs/IgfsOutputStreamAdapter.java           | 265 ---------
 .../processors/igfs/IgfsOutputStreamImpl.java   | 558 +++++++++++--------
 .../internal/processors/igfs/IgfsUtils.java     |   2 +-
 .../igfs/meta/IgfsMetaFileUnlockProcessor.java  |  69 ++-
 .../ignite/igfs/IgfsFragmentizerSelfTest.java   |   2 -
 .../IgniteCacheMessageWriteTimeoutTest.java     | 129 +++++
 .../processors/igfs/IgfsAbstractSelfTest.java   |  15 +-
 .../igfs/IgfsDataManagerSelfTest.java           |  12 +-
 .../processors/igfs/IgfsModesSelfTest.java      |   1 +
 .../igfs/IgfsProcessorValidationSelfTest.java   |  38 +-
 .../processors/igfs/IgfsSizeSelfTest.java       | 133 -----
 .../processors/igfs/IgfsTaskSelfTest.java       |   2 +-
 .../ignite/testsuites/IgniteCacheTestSuite.java |   2 +
 .../ignite/hadoop/util/BasicUserNameMapper.java |   4 +-
 .../util/BasicUserNameMapperSelfTest.java       |  19 +-
 .../igfs/HadoopFIleSystemFactorySelfTest.java   |   1 +
 .../HadoopDefaultMapReducePlannerSelfTest.java  |   6 -
 31 files changed, 1115 insertions(+), 1154 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/61210943/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java
----------------------------------------------------------------------


Mime
View raw message