Merge branches 'ignite-1.6' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7755c80c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7755c80c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7755c80c Branch: refs/heads/ignite-2832 Commit: 7755c80ca8d3964cb3c40a30802bb7817a4e7e71 Parents: 3bd5839 949f0a4 Author: Alexey Kuznetsov <[email protected]> Authored: Wed May 11 09:52:19 2016 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Wed May 11 09:52:19 2016 +0700 ---------------------------------------------------------------------- .../cpp/odbc/src/config/configuration.cpp | 2 +- modules/platforms/dotnet/Apache.Ignite.sln | 16 ++++---- .../commands/alert/VisorAlertCommand.scala | 43 +++++++++----------- 3 files changed, 30 insertions(+), 31 deletions(-) ----------------------------------------------------------------------
