Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a6dcb591 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a6dcb591 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a6dcb591 Branch: refs/heads/ignite-843-rc2 Commit: a6dcb59188687573d8b8fd5bfe9340b4ff4db14f Parents: aad7992 c8e5dd4 Author: Alexey Kuznetsov <[email protected]> Authored: Tue Dec 15 13:00:20 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Tue Dec 15 13:00:20 2015 +0700 ---------------------------------------------------------------------- .../main/js/app/directives/ui-ace-docker/ui-ace-docker.jade | 2 +- .../src/main/js/app/directives/ui-ace-java/ui-ace-java.jade | 2 +- .../src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.jade | 2 +- .../src/main/js/app/directives/ui-ace-pom/ui-ace-pom.jade | 2 +- .../src/main/js/app/directives/ui-ace-xml/ui-ace-xml.jade | 2 +- .../states/configuration/summary/summary.controller.js | 7 ++++++- .../src/main/js/app/services/UiAceOnLoad/service.js | 2 +- 7 files changed, 12 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
