Merge branch 'ignite-1.5.2' into ignite-1.5.3
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fc48a842 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fc48a842 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fc48a842 Branch: refs/heads/ignite-1.5.3 Commit: fc48a8429a84ef6c87ed3225a218d7d3ae617e14 Parents: 090a5de 86c4816 Author: vozerov-gridgain <[email protected]> Authored: Fri Jan 8 11:48:42 2016 +0400 Committer: vozerov-gridgain <[email protected]> Committed: Fri Jan 8 11:48:42 2016 +0400 ---------------------------------------------------------------------- .../internal/binary/BinaryClassDescriptor.java | 15 ++++++++++----- .../hadoop/fs/BasicHadoopFileSystemFactory.java | 19 ++++++++++++++++++- .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 6 +++--- .../hadoop/fs/v1/IgniteHadoopFileSystem.java | 7 ++++++- .../hadoop/fs/v2/IgniteHadoopFileSystem.java | 7 +++++++ 5 files changed, 44 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
