ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [43/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-2' into ignite-283
Date Thu, 19 Feb 2015 12:59:29 GMT
Merge branch 'sprint-2' into ignite-283

Conflicts:
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.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/38063faa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/38063faa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/38063faa

Branch: refs/heads/ignite-283
Commit: 38063faacefe2f4651585d608cd8c253ff80f817
Parents: 391e43f 7cb404d
Author: vozerov <vozerov@gridgain.com>
Authored: Thu Feb 19 15:14:11 2015 +0300
Committer: vozerov <vozerov@gridgain.com>
Committed: Thu Feb 19 15:14:11 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheAdapter.java        |  8 ++++----
 .../internal/processors/cache/GridCacheUtils.java | 18 ++++++++----------
 .../distributed/dht/GridDhtCacheAdapter.java      |  4 ++--
 3 files changed, 14 insertions(+), 16 deletions(-)
----------------------------------------------------------------------



Mime
View raw message