ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [41/46] incubator-ignite git commit: Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-tests
Date Wed, 25 Feb 2015 00:37:04 GMT
Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-tests


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

Branch: refs/heads/ignite-sql-tests
Commit: 7e5034d7f8c092b1da86859d303962f1f4e10942
Parents: 1b9a97a d6793f2
Author: S.Vladykin <svladykin@gridgain.com>
Authored: Wed Feb 25 01:05:57 2015 +0300
Committer: S.Vladykin <svladykin@gridgain.com>
Committed: Wed Feb 25 01:05:57 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/GridKernalContext.java      |   8 -
 .../ignite/internal/GridKernalContextImpl.java  |  12 -
 .../apache/ignite/internal/IgniteKernal.java    |   5 +-
 .../discovery/GridDiscoveryManager.java         |  26 +-
 .../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      |  40 +-
 .../cache/version/GridCacheVersion.java         |   3 +-
 .../GridCacheVersionConflictContext.java        |  35 +-
 .../cache/version/GridCacheVersionEx.java       |   2 +-
 .../dr/GridDrDataLoadCacheUpdater.java          |   6 +-
 .../processors/rest/GridRestProcessor.java      |  85 ++-
 .../securesession/GridSecureSession.java        |  60 --
 .../GridSecureSessionProcessor.java             |  59 --
 .../os/GridOsSecureSessionProcessor.java        |  61 --
 .../security/GridSecurityContext.java           | 251 ---------
 .../security/GridSecurityProcessor.java         |   6 +-
 .../processors/security/SecurityContext.java    |  56 ++
 .../security/os/GridOsSecurityProcessor.java    | 146 +----
 .../optimized/optimized-classnames.properties   |   1 -
 .../DiscoverySpiNodeAuthenticator.java          |   2 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      | 139 ++---
 .../core/src/main/resources/ignite.properties   |   2 +-
 .../discovery/AbstractDiscoverySelfTest.java    |  15 -
 .../tcp/TcpDiscoverySpiStartStopSelfTest.java   |  23 -
 .../ignite/testframework/junits/IgniteMock.java |   1 -
 .../junits/spi/GridSpiAbstractTest.java         |  12 -
 .../client/hadoop/GridHadoopClientProtocol.java |   3 +-
 .../hadoop/GridHadoopDefaultJobInfo.java        |   5 +-
 pom.xml                                         |   2 +-
 35 files changed, 696 insertions(+), 1199 deletions(-)
----------------------------------------------------------------------



Mime
View raw message