Merge remote-tracking branch 'remotes/origin/master' into ignite-882
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/29840525 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/29840525 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/29840525 Branch: refs/heads/ignite-882 Commit: 29840525ee22935c2cd12412ab9be974db2a41d5 Parents: c0ae471 96c9695 Author: Denis Magda <dma...@gridgain.com> Authored: Tue Jul 7 11:36:08 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Tue Jul 7 11:36:08 2015 +0300 ---------------------------------------------------------------------- modules/core/pom.xml | 4 +-- .../internal/interop/InteropIgnition.java | 31 +++++++++++++------- .../processors/cache/CacheObjectImpl.java | 1 - .../dht/GridPartitionedGetFuture.java | 13 ++++++-- modules/mesos/pom.xml | 1 - modules/rest-http/pom.xml | 14 ++++----- modules/urideploy/pom.xml | 8 ++--- modules/web/pom.xml | 6 ++-- parent/pom.xml | 1 + 9 files changed, 47 insertions(+), 32 deletions(-) ----------------------------------------------------------------------