ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [16/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/sprint-3' into sprint-3
Date Fri, 27 Mar 2015 10:42:00 GMT
Merge remote-tracking branch 'origin/sprint-3' into 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/184b2009
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/184b2009
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/184b2009

Branch: refs/heads/ignite-443
Commit: 184b20099afb1feb88645815eeff126ada8fd15a
Parents: a5ae170 2550e77
Author: avinogradov <avinogradov@gridgain.com>
Authored: Thu Mar 26 13:18:49 2015 +0300
Committer: avinogradov <avinogradov@gridgain.com>
Committed: Thu Mar 26 13:18:49 2015 +0300

----------------------------------------------------------------------
 .../examples/datagrid/CacheQueryExample.java    |  12 +-
 .../datagrid/CacheTransactionExample.java       |   6 +-
 .../src/main/java/org/apache/ignite/Ignite.java |  84 +++++----
 .../java/org/apache/ignite/IgniteCache.java     |  59 +++---
 .../java/org/apache/ignite/IgniteCluster.java   |   4 +-
 .../java/org/apache/ignite/IgniteCompute.java   | 161 +++++++----------
 .../java/org/apache/ignite/IgniteEvents.java    |  60 ++++---
 .../java/org/apache/ignite/IgniteMessaging.java |  56 +++---
 .../java/org/apache/ignite/IgniteServices.java  |  40 +++--
 .../org/apache/ignite/IgniteTransactions.java   |  26 ++-
 .../apache/ignite/cache/CacheInterceptor.java   |   3 +-
 .../apache/ignite/cache/affinity/Affinity.java  |  49 ++---
 .../org/apache/ignite/cluster/ClusterGroup.java | 180 +++++++++----------
 .../org/apache/ignite/cluster/ClusterNode.java  |  49 +++--
 .../cluster/ClusterTopologyException.java       |   2 +-
 .../configuration/CacheConfiguration.java       |   3 -
 .../configuration/IgniteConfiguration.java      |  32 ++--
 .../ignite/internal/IgniteComponentType.java    |   7 +
 .../discovery/GridDiscoveryManager.java         |   3 +-
 .../processors/cache/GridCacheEntryEx.java      |   1 +
 .../processors/cache/GridCacheMapEntry.java     |  11 +-
 .../GridDistributedTxRemoteAdapter.java         |  16 +-
 .../GridFutureRemapTimeoutObject.java           |  73 ++++++++
 .../dht/GridPartitionedGetFuture.java           |  26 ++-
 .../dht/atomic/GridDhtAtomicCache.java          |   3 +
 .../distributed/near/GridNearAtomicCache.java   |   2 +
 .../distributed/near/GridNearCacheEntry.java    |  22 +--
 .../distributed/near/GridNearGetFuture.java     |  77 ++------
 .../distributed/near/GridNearLockFuture.java    |   4 +-
 .../near/GridNearTxPrepareFuture.java           |   2 +-
 .../processors/query/GridQueryProcessor.java    |  15 ++
 .../service/GridServiceProcessor.java           |   4 +-
 .../org/apache/ignite/lang/IgnitePredicate.java |   3 +-
 .../apache/ignite/transactions/Transaction.java |   8 +-
 .../processors/cache/GridCacheTestEntryEx.java  |   1 +
 .../cache/IgniteDynamicCacheStartSelfTest.java  |  33 ++++
 .../ignite/messaging/GridMessagingSelfTest.java |  13 +-
 .../http/jetty/GridJettyRestHandler.java        |   6 +
 38 files changed, 625 insertions(+), 531 deletions(-)
----------------------------------------------------------------------



Mime
View raw message