Merge remote-tracking branch 'remotes/origin/master' into ignite-1093-2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4c9792e4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4c9792e4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4c9792e4 Branch: refs/heads/ignite-1093-2 Commit: 4c9792e4f32f8b2b8aed17f7282b158176fb4725 Parents: fbc26f7 3a29b97 Author: Anton Vinogradov <[email protected]> Authored: Thu Oct 15 16:22:24 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Thu Oct 15 16:22:24 2015 +0300 ---------------------------------------------------------------------- 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(-) ----------------------------------------------------------------------
