You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/03/15 11:41:51 UTC
[22/22] ignite git commit: Merge branch 'master' into ignite-1786
Merge branch 'master' into ignite-1786
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e2ae0001
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e2ae0001
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e2ae0001
Branch: refs/heads/ignite-1786
Commit: e2ae000132a273cd0e7ad9dcce7655cd33d2d813
Parents: b884c32 18de768
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Mar 15 13:41:13 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Mar 15 13:41:13 2016 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/IgnitionEx.java | 9 +
.../processors/cache/GridCacheEntryEx.java | 3 +-
.../processors/cache/GridCacheMapEntry.java | 14 +-
.../dht/preloader/GridDhtPartitionDemander.java | 8 +-
.../cache/transactions/IgniteTxAdapter.java | 6 +-
.../processors/igfs/IgfsDeleteWorker.java | 28 +-
.../internal/processors/igfs/IgfsFileInfo.java | 9 +-
.../internal/processors/igfs/IgfsImpl.java | 5 +-
.../processors/igfs/IgfsMetaManager.java | 481 ++++++++++++++-----
.../processors/igfs/IgfsOutputStreamImpl.java | 78 +--
.../internal/processors/igfs/IgfsUtils.java | 72 +++
.../ignite/internal/util/IgniteUtils.java | 2 +
.../config/websession/example-cache-base.xml | 148 ++++++
.../config/websession/example-cache-client.xml | 33 ++
.../test/config/websession/example-cache.xml | 128 +----
.../test/config/websession/example-cache2.xml | 31 ++
...ridCacheStoreManagerDeserializationTest.java | 1 +
.../processors/cache/GridCacheTestEntryEx.java | 2 +-
.../processors/igfs/IgfsAbstractSelfTest.java | 21 +-
.../igfs/IgfsDataManagerSelfTest.java | 6 +-
.../igfs/IgfsMetaManagerSelfTest.java | 2 +-
.../processors/igfs/IgfsProcessorSelfTest.java | 9 +-
.../processors/igfs/IgfsSizeSelfTest.java | 13 +-
.../ignite/testsuites/IgniteIgfsTestSuite.java | 6 -
.../cache/websession/WebSessionFilter.java | 188 ++++++--
.../cache/websession/WebSessionListener.java | 60 +--
.../internal/websession/WebSessionSelfTest.java | 72 +++
27 files changed, 967 insertions(+), 468 deletions(-)
----------------------------------------------------------------------