Merge remote-tracking branch 'remotes/origin/master' into ignite-1192
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cf27e545 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cf27e545 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cf27e545 Branch: refs/heads/ignite-1192 Commit: cf27e545e4235c82430e300913725dd094cededa Parents: 8091522 84880a8 Author: Denis Magda <dma...@gridgain.com> Authored: Thu Mar 16 16:04:11 2017 -0700 Committer: Denis Magda <dma...@gridgain.com> Committed: Thu Mar 16 16:04:11 2017 -0700 ---------------------------------------------------------------------- .../internal/managers/GridManagerAdapter.java | 4 + .../cache/DynamicCacheChangeBatch.java | 14 ++ .../cache/GridCacheAffinityManager.java | 21 ++- .../cache/GridCacheManagerAdapter.java | 2 +- .../processors/cache/GridCacheProcessor.java | 2 +- .../processors/query/GridQueryProcessor.java | 20 +- .../service/GridServiceProcessor.java | 49 ++--- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 5 + .../org/apache/ignite/spi/IgniteSpiContext.java | 6 + .../ignite/spi/discovery/tcp/ClientImpl.java | 32 +++- .../ignite/spi/discovery/tcp/ServerImpl.java | 19 ++ .../spi/discovery/tcp/TcpDiscoverySpi.java | 5 + .../tcp/internal/TcpDiscoveryNode.java | 6 +- ...ridFailFastNodeFailureDetectionSelfTest.java | 2 +- .../GridServiceContinuousQueryRedeploy.java | 167 +++++++++++++++++ ...veryNodeAttributesUpdateOnReconnectTest.java | 110 +++++++++++ .../TcpDiscoverySslSecuredUnsecuredTest.java | 185 +++++++++++++++++++ .../tcp/TestReconnectPluginProvider.java | 111 +++++++++++ .../discovery/tcp/TestReconnectProcessor.java | 93 ++++++++++ .../testframework/GridSpiTestContext.java | 5 + .../testsuites/IgniteKernalSelfTestSuite.java | 2 + .../IgniteSpiDiscoverySelfTestSuite.java | 5 + .../org.apache.ignite.plugin.PluginProvider | 1 + .../processors/query/h2/IgniteH2Indexing.java | 1 + .../cache/IncorrectCacheTypeMetadataTest.java | 72 ++++++++ .../cache/IncorrectQueryEntityTest.java | 75 ++++++++ .../IgniteCacheQuerySelfTestSuite.java | 4 + modules/web-console/backend/app/agent.js | 14 +- modules/web-console/backend/app/browser.js | 8 +- .../ui-grid-settings/ui-grid-settings.scss | 35 ++++ .../frontend/app/modules/agent/agent.module.js | 10 +- .../frontend/app/modules/sql/sql.controller.js | 25 ++- .../frontend/public/stylesheets/style.scss | 8 +- .../web-console/frontend/views/sql/sql.tpl.pug | 39 ++-- parent/pom.xml | 1 + 35 files changed, 1086 insertions(+), 72 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/cf27e545/parent/pom.xml ----------------------------------------------------------------------