ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntikho...@apache.org
Subject [39/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-1.3' into ignite-1.3
Date Thu, 16 Jul 2015 07:16:05 GMT
Merge remote-tracking branch 'origin/ignite-1.3' into ignite-1.3

Conflicts:
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java


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

Branch: refs/heads/master
Commit: b19f5c45fe179d12024fc12f4f2b9823ea04ebe0
Parents: a233fa0 e11f46b
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Jul 10 10:49:53 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Jul 10 10:49:53 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/IgniteCacheFutureImpl.java |  6 +++
 .../processors/cache/IgniteCacheProxy.java      | 55 ++++++--------------
 .../util/future/GridFutureChainListener.java    |  4 --
 .../internal/util/future/IgniteFutureImpl.java  | 12 +++--
 .../cache/GridCacheAbstractFullApiSelfTest.java | 32 ++++++++++++
 5 files changed, 63 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b19f5c45/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------


Mime
View raw message