Merge remote-tracking branch 'remotes/origin/ignite-137' into sprint-1
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/IgniteClusterAsyncImpl.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/0e110c0c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0e110c0c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0e110c0c
Branch: refs/heads/ignite-32
Commit: 0e110c0c1f7b6fa08ae6f0a079494a73de663dbf
Parents: a6d87ac 7614cff
Author: sevdokimov <sevdoki...@gridgain.com>
Authored: Wed Jan 28 13:16:28 2015 +0300
Committer: sevdokimov <sevdoki...@gridgain.com>
Committed: Wed Jan 28 13:16:28 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/IgniteClusterAsyncImpl.java | 9 +--
.../ignite/internal/IgniteComputeImpl.java | 70 +++++++++-----------
.../ignite/internal/IgniteEventsImpl.java | 9 +--
.../ignite/internal/IgniteMessagingImpl.java | 12 ++--
.../processors/cache/IgniteCacheProxy.java | 8 +--
.../processors/fs/GridGgfsAsyncImpl.java | 7 +-
.../ignite/lang/IgniteAsyncSupportAdapter.java | 35 +++++++++-
7 files changed, 79 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0e110c0c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------
