You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/08/28 16:01:45 UTC

[14/33] ignite git commit: Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/ignite-1093
Commit: 7c2c02bf0fb57e90c22bb28e71796b378f1d755b
Parents: a312934 00b27ce
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Aug 27 13:17:43 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Aug 27 13:17:43 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheAdapter.java      |   6 +-
 .../dht/atomic/GridDhtAtomicCache.java          |   6 +-
 .../util/future/GridEmbeddedFuture.java         |  55 +++-
 .../distributed/CacheAsyncOperationsTest.java   | 280 +++++++++++++++++++
 .../testsuites/IgniteCacheTestSuite3.java       |   2 +
 5 files changed, 342 insertions(+), 7 deletions(-)
----------------------------------------------------------------------