ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [47/50] [abbrv] incubator-ignite git commit: Merge branch 'ignite-36' into sprint-1
Date Thu, 22 Jan 2015 20:55:15 GMT
Merge branch 'ignite-36' into sprint-1


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

Branch: refs/heads/ignite-53
Commit: 4174b339ad921f87fcf6e1bc4178d19bb2a60c64
Parents: 9f2bb6c a229771
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Thu Jan 22 20:28:14 2015 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Thu Jan 22 20:28:14 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/cache/store/CacheStore.java   |   5 +-
 .../org/apache/ignite/cluster/ClusterNode.java  |  39 +++-
 .../ignite/cluster/ClusterNodeLocalMap.java     |   3 +-
 .../ignite/compute/ComputeJobSibling.java       |   3 +-
 .../ignite/compute/ComputeLoadBalancer.java     |   3 +-
 .../ignite/logger/java/IgniteJavaLogger.java    |   4 +-
 .../apache/ignite/transactions/IgniteTx.java    |  31 +++
 .../org/gridgain/grid/GridMetadataAware.java    | 187 -------------------
 .../org/gridgain/grid/cache/GridCacheEntry.java |  77 +++++++-
 .../grid/kernal/ClusterNodeLocalMapImpl.java    |  80 --------
 .../grid/kernal/GridJobContextImpl.java         |   4 +-
 .../grid/kernal/GridJobSiblingImpl.java         |   3 +-
 .../gridgain/grid/kernal/GridKernalContext.java |   3 +-
 .../grid/kernal/GridKernalContextImpl.java      |   4 +-
 .../gridgain/grid/kernal/GridLoggerProxy.java   |   5 +-
 .../kernal/executor/GridExecutorService.java    |   4 +-
 .../loadbalancer/GridLoadBalancerAdapter.java   |   4 +-
 .../processors/cache/GridCacheAdapter.java      |   2 +-
 .../processors/cache/GridCacheEntryEx.java      |  85 ++++++++-
 .../processors/cache/GridCacheEntryImpl.java    |  54 +-----
 .../cache/GridCacheEvictionEntry.java           |  36 ----
 .../cache/GridCacheFilterEvaluationEntry.java   |  36 ----
 .../processors/cache/GridCacheLogger.java       |   3 +-
 .../processors/cache/GridCacheMapEntry.java     |  88 +--------
 .../processors/cache/GridCacheStoreManager.java |   7 +-
 .../GridPartitionedCacheEntryImpl.java          | 147 ---------------
 .../cache/query/GridCacheQueryManager.java      |  37 ----
 .../GridCacheContinuousQueryEntry.java          |  50 -----
 .../cache/transactions/IgniteTxEx.java          |   3 +-
 .../cache/transactions/IgniteTxProxyImpl.java   |  19 +-
 .../java/org/gridgain/grid/util/GridUtils.java  |  19 --
 .../grid/util/lang/GridComputeJobWrapper.java   |  14 +-
 .../org/gridgain/grid/util/lang/GridFunc.java   | 146 ---------------
 .../util/lang/GridMetadataAwareAdapter.java     | 159 ++++++++++++----
 .../org/gridgain/grid/GridTestJobContext.java   |   3 +-
 .../gridgain/grid/lang/GridTupleSelfTest.java   |  85 ---------
 .../junits/logger/GridTestLog4jLogger.java      |   4 +-
 .../gridgain/grid/logger/jcl/GridJclLogger.java |   3 +-
 .../ignite/logger/log4j/IgniteLog4jLogger.java  |   4 +-
 .../processors/schedule/ScheduleFutureImpl.java |   6 +-
 .../grid/logger/slf4j/GridSlf4jLogger.java      |   3 +-
 .../java/org/gridgain/grid/GridSpringBean.java  |   3 +-
 42 files changed, 401 insertions(+), 1074 deletions(-)
----------------------------------------------------------------------



Mime
View raw message