Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3

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

Branch: refs/heads/ignite-sprint-3
Commit: 942f6de740a124358e954137ecefe164d85c9978
Parents: b2984c9 e144a68
Author: Dmitiry Setrakyan <dsetrak...@gridgain.com>
Authored: Mon Apr 6 23:16:11 2015 -0700
Committer: Dmitiry Setrakyan <dsetrak...@gridgain.com>
Committed: Mon Apr 6 23:16:11 2015 -0700

----------------------------------------------------------------------
 .../store/jdbc/CacheAbstractJdbcStore.java      | 104 ++++++++++++++-----
 .../ignite/internal/visor/cache/VisorCache.java |  19 +++-
 .../VisorCacheConfigurationCollectorJob.java    |  76 ++++++++++++++
 .../VisorCacheConfigurationCollectorTask.java   |  39 +++++++
 .../VisorIgfsProfilerUniformityCounters.java    |   6 +-
 .../visor/node/VisorGridConfiguration.java      |  38 -------
 .../visor/node/VisorIgfsConfiguration.java      |   2 +-
 .../visor/node/VisorRestConfiguration.java      |   1 +
 .../internal/visor/util/VisorTaskUtils.java     |   3 +-
 .../h2/twostep/GridReduceQueryExecutor.java     |   2 +-
 .../commands/cache/VisorCacheCommand.scala      |  26 ++---
 .../config/VisorConfigurationCommand.scala      |  15 +--
 .../visor/commands/gc/VisorGcCommand.scala      |  15 +--
 .../scala/org/apache/ignite/visor/visor.scala   |  34 ++++--
 .../yardstick/config/benchmark-store.properties |   5 +-
 15 files changed, 275 insertions(+), 110 deletions(-)
----------------------------------------------------------------------


Reply via email to