Merge remote-tracking branch 'remotes/origin/master' into ignite-5272

Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7a727334
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7a727334
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7a727334

Branch: refs/heads/ignite-5272
Commit: 7a72733404205cf443b2245dacce8d735f5bd58b
Parents: 86065d2 f337f14
Author: sboikov <[email protected]>
Authored: Tue Jun 13 15:15:44 2017 +0300
Committer: sboikov <[email protected]>
Committed: Tue Jun 13 15:15:44 2017 +0300

----------------------------------------------------------------------
 .../cache/query/GridCacheQueryAdapter.java      |   9 +-
 .../compute/VisorComputeCancelSessionsTask.java |   6 +-
 .../VisorComputeCancelSessionsTaskArg.java      |  10 +-
 .../cache/CacheIteratorScanQueryTest.java       | 110 +++++++++++++++++++
 .../cache/IgniteCacheNoClassQuerySelfTest.java  |   6 +-
 .../IgniteCacheQuerySelfTestSuite.java          |   2 +
 .../ProjectFilesTest.cs                         |   7 +-
 .../frontend/app/helpers/jade/mixins.pug        |   1 +
 .../frontend/app/primitives/index.js            |   1 +
 .../frontend/app/primitives/switch/index.pug    |  34 ++++++
 .../frontend/app/primitives/switch/index.scss   |  87 +++++++++++++++
 .../ignite/console/demo/AgentClusterDemo.java   |   3 +
 .../demo/service/DemoComputeLoadService.java    |  79 +++++++++++++
 .../console/demo/task/DemoCancellableTask.java  |  92 ++++++++++++++++
 .../console/demo/task/DemoComputeTask.java      | 105 ++++++++++++++++++
 15 files changed, 536 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


Reply via email to