[3/3] ignite git commit: Merge branches 'ignite-2.1.3' and 'master'.

2017-08-06 Thread akuznetsov 
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/9b730e73
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9b730e73
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9b730e73

Branch: refs/heads/master
Commit: 9b730e732dcc7d307390f9a40cce8469e738e540
Parents: 70ffa2c 0eedf46
Author: Alexey Kuznetsov 
Authored: Mon Aug 7 10:00:01 2017 +0700
Committer: Alexey Kuznetsov 
Committed: Mon Aug 7 10:00:01 2017 +0700

--
 .../hide-on-state-change/hide-on-state-change.directive.js   | 8 ++--
 modules/web-console/frontend/views/index.pug | 8 
 2 files changed, 10 insertions(+), 6 deletions(-)
--

[3/3] ignite git commit: Merge branches 'ignite-2.1.3' and 'master'.

2017-08-02 Thread akuznetsov 
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/master
Commit: 80cc292c0d09acdb327047090c1d1448ef6b
Parents: d2cb2f7 6bdad4d
Author: Alexey Kuznetsov 
Authored: Thu Aug 3 11:52:06 2017 +0700
Committer: Alexey Kuznetsov 
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(-)
--