Merge remote-tracking branch 'origin/ignite-164v2' into ignite-164v2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e38750bc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e38750bc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e38750bc Branch: refs/heads/ignite-sql-tests Commit: e38750bc53f47b6e899ef871fe929a5959d28fc8 Parents: fe005ea 1ac099a Author: Artem Shutak <ashu...@gridgain.com> Authored: Fri Feb 6 18:09:04 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Fri Feb 6 18:09:04 2015 +0300 ---------------------------------------------------------------------- .../ignite/client/hadoop/GridHadoopClientProtocol.java | 4 ++-- .../ignite/internal/processors/hadoop/GridHadoopSetup.java | 2 +- .../ignite/internal/processors/hadoop/GridHadoopUtils.java | 8 ++++---- .../processors/hadoop/counter/GridHadoopFSCounterWriter.java | 2 +- .../processors/hadoop/GridHadoopPopularWordsTest.java | 4 ++-- .../ignite/internal/processors/hadoop/GridHadoopStartup.java | 2 +- .../rest/protocols/http/jetty/GridJettyRestHandler.java | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
