You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vk...@apache.org on 2014/12/23 00:40:06 UTC

[12/20] incubator-ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-61

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-61


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

Branch: refs/heads/ignite-61
Commit: 469f3651cf7bd16163acfdae5b5abb77d6dd0e2d
Parents: 1767ba5 47cf475
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Fri Dec 19 14:59:17 2014 +0300
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Fri Dec 19 14:59:17 2014 +0300

----------------------------------------------------------------------
 ipc/shmem/ggshmem/Makefile.am                   |     2 +-
 ipc/shmem/ggshmem/Makefile.in                   |     2 +-
 .../java/META-INF/native/linux32/libggshmem.so  |   Bin 136714 -> 0 bytes
 .../java/META-INF/native/linux64/libggshmem.so  |   Bin 145904 -> 161925 bytes
 .../java/META-INF/native/osx/libggshmem.dylib   |   Bin 29312 -> 32940 bytes
 .../optimized-classnames.previous.properties    | 30621 -----------------
 .../optimized/optimized-classnames.properties   | 30621 -----------------
 .../grid/kernal/visor/cache/VisorCache.java     |     4 +-
 .../cache/VisorCacheAggregatedMetrics.java      |   417 +-
 .../kernal/visor/cache/VisorCacheMetrics.java   |   176 +-
 .../kernal/visor/cache/VisorCacheMetrics2.java  |   218 -
 .../cache/VisorCacheMetricsCollectorTask.java   |   104 +-
 .../cache/VisorCacheQueryAggregatedMetrics.java |   129 -
 .../visor/cache/VisorCacheQueryMetrics.java     |    44 +-
 .../visor/node/VisorGridConfiguration.java      |     2 +-
 .../VisorNodeConfigurationCollectorJob.java     |     2 +-
 .../grid/kernal/visor/util/VisorTaskUtils.java  |    42 +
 .../core/src/main/resources/gridgain.properties |     2 +-
 .../commands/cache/VisorCacheCommand.scala      |   127 +-
 .../visor/commands/vvm/VisorVvmCommand.scala    |     9 +-
 20 files changed, 454 insertions(+), 62068 deletions(-)
----------------------------------------------------------------------