Merge branches 'ignite-201' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-201
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d991866d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d991866d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d991866d Branch: refs/heads/ignite-96 Commit: d991866d610c107311fba65ea4269cff72f74a16 Parents: 0a2125e 7c31c72 Author: Dmitiry Setrakyan <dsetrak...@gridgain.com> Authored: Sun Feb 8 17:38:13 2015 -0800 Committer: Dmitiry Setrakyan <dsetrak...@gridgain.com> Committed: Sun Feb 8 17:38:13 2015 -0800 ---------------------------------------------------------------------- .../ignite/examples/fs/IgniteFsExample.java | 278 ------------------- .../examples/fs/IgniteFsMapReduceExample.java | 249 ----------------- .../ignite/examples/fs/IgniteFsNodeStartup.java | 41 --- .../org/apache/ignite/examples/fs/package.html | 24 -- .../examples/ignitefs/IgniteFsExample.java | 278 +++++++++++++++++++ .../ignitefs/IgniteFsMapReduceExample.java | 249 +++++++++++++++++ .../examples/ignitefs/IgniteFsNodeStartup.java | 41 +++ .../ignite/examples/ignitefs/package.html | 24 ++ .../examples/IgniteFsExamplesSelfTest.java | 2 +- .../java/org/apache/ignite/IgniteCache.java | 11 +- .../java/org/apache/ignite/IgniteCluster.java | 17 +- .../org/apache/ignite/IgniteDataLoader.java | 2 +- .../main/java/org/apache/ignite/IgniteFs.java | 6 +- .../java/org/apache/ignite/IgniteLogger.java | 2 +- .../java/org/apache/ignite/IgniteQueue.java | 10 +- .../java/org/apache/ignite/IgniteServices.java | 13 +- .../java/org/apache/ignite/IgniteStreamer.java | 5 +- .../org/apache/ignite/IgniteTransactions.java | 3 +- .../ignite/ignitefs/IgniteFsFileSystem.java | 4 +- .../GridCacheAffinityBackupsSelfTest.java | 4 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 4 +- ...chePartitionedReloadAllAbstractSelfTest.java | 56 ++-- 22 files changed, 663 insertions(+), 660 deletions(-) ----------------------------------------------------------------------
