Merge branches 'ignite-2.1.3' and 'master'.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/80cc292c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/80cc292c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/80cc292c Branch: refs/heads/ignite-5872 Commit: 80cc292c0d09acdb327047090c1d1448ffffef6b Parents: d2cb2f7 6bdad4d Author: Alexey Kuznetsov <akuznet...@apache.org> Authored: Thu Aug 3 11:52:06 2017 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Thu Aug 3 11:52:06 2017 +0700 ---------------------------------------------------------------------- modules/web-console/backend/app/mongo.js | 2 +- modules/web-console/backend/middlewares/api.js | 9 ++++----- modules/web-console/backend/services/activities.js | 12 ++---------- .../modules/configuration/generator/Maven.service.js | 13 ++++++++++--- 4 files changed, 17 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
