Merge remote-tracking branch 'origin/ignite-26' into ignite-26
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/addef7eb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/addef7eb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/addef7eb Branch: refs/heads/ignite-106 Commit: addef7ebf59ca061c8de7421d445a5c8ede3eca0 Parents: cf72dda 6e104b8 Author: sboikov <[email protected]> Authored: Mon Feb 2 17:02:04 2015 +0300 Committer: sboikov <[email protected]> Committed: Mon Feb 2 17:02:04 2015 +0300 ---------------------------------------------------------------------- .../processors/fs/GridGgfsMetaManager.java | 69 +++++++++++--------- .../fs/GridGgfsMetaManagerSelfTest.java | 22 ++++--- .../processors/fs/GridGgfsModesSelfTest.java | 4 +- .../fs/hadoop/v1/GridGgfsHadoopFileSystem.java | 4 +- 4 files changed, 57 insertions(+), 42 deletions(-) ----------------------------------------------------------------------
