Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1676ff65 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1676ff65 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1676ff65 Branch: refs/heads/ignite-4986 Commit: 1676ff656b3ea3efbc32864f333c43e3edde3318 Parents: a1b5b8c a025268 Author: devozerov <[email protected]> Authored: Fri Apr 14 14:22:26 2017 +0300 Committer: devozerov <[email protected]> Committed: Fri Apr 14 14:22:26 2017 +0300 ---------------------------------------------------------------------- .../rest/client/message/GridClientNodeBean.java | 2 +- .../top/GridTopologyCommandHandler.java | 4 + .../visor/service/VisorServiceDescriptor.java | 9 +- ...ryConfigurationCustomSerializerSelfTest.java | 147 +++++++++++++++++++ .../IgniteBinaryObjectsTestSuite.java | 2 + .../platforms/cpp/core-test/src/cache_test.cpp | 38 ++--- .../frontend/app/helpers/jade/mixins.pug | 12 +- .../frontend/app/modules/sql/sql.controller.js | 6 - .../frontend/app/primitives/btn-group/index.pug | 35 +++++ .../views/configuration/domains-import.tpl.pug | 2 +- .../views/configuration/domains.tpl.pug | 1 - .../web-console/frontend/views/sql/sql.tpl.pug | 12 +- 12 files changed, 228 insertions(+), 42 deletions(-) ----------------------------------------------------------------------
