Merge branches 'ignite-843-rc1' and 'master' of 
https://git-wip-us.apache.org/repos/asf/ignite into ignite-843-rc1


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

Branch: refs/heads/ignite-843-rc1
Commit: d0db795f555cc291d2a503cac4d482df1406b81d
Parents: 88cbb0e 3a29b97
Author: Andrey <[email protected]>
Authored: Thu Oct 15 17:58:38 2015 +0700
Committer: Andrey <[email protected]>
Committed: Thu Oct 15 17:58:38 2015 +0700

----------------------------------------------------------------------
 modules/apache-license-gen/pom.xml              |   3 +
 .../JettyRestProcessorAbstractSelfTest.java     |   4 +-
 .../processors/igfs/IgfsDataManager.java        |   2 -
 .../processors/igfs/IgfsDeleteWorker.java       | 102 ++-
 .../internal/processors/igfs/IgfsImpl.java      | 164 +---
 .../processors/igfs/IgfsMetaManager.java        | 897 ++++++++++++-------
 .../processors/igfs/IgfsOutputStreamImpl.java   |   2 +
 .../internal/processors/igfs/IgfsUtils.java     |  23 +
 .../ignite/igfs/IgfsEventsAbstractSelfTest.java |   6 +-
 .../processors/igfs/IgfsAbstractSelfTest.java   | 639 ++++++++++---
 .../igfs/IgfsDataManagerSelfTest.java           |  13 +-
 .../igfs/IgfsMetaManagerSelfTest.java           | 170 ++--
 .../processors/igfs/IgfsProcessorSelfTest.java  |  12 +-
 .../ignite/testsuites/IgniteIgfsTestSuite.java  |   6 +
 .../hadoop/igfs/HadoopIgfsWrapper.java          |  54 +-
 .../ignite/igfs/Hadoop1DualAbstractTest.java    |   5 -
 .../HadoopIgfs20FileSystemAbstractSelfTest.java |  27 +-
 .../IgniteHadoopFileSystemAbstractSelfTest.java |   2 +-
 .../main/cpp/common/project/vs/common.vcxproj   |   4 +-
 .../http/jetty/GridJettyRestHandler.java        |   2 +-
 20 files changed, 1342 insertions(+), 795 deletions(-)
----------------------------------------------------------------------


Reply via email to