Merge remote-tracking branch 'remotes/origin/master' into ignite-964-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a5654be4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a5654be4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a5654be4 Branch: refs/heads/ignite-964-1 Commit: a5654be4d1d883c8b4da0f69899dbb5753a8f584 Parents: 70fa58e 8c1ba5a Author: ivasilinets <ivasilin...@gridgain.com> Authored: Tue Jul 7 15:48:22 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Tue Jul 7 15:48:22 2015 +0300 ---------------------------------------------------------------------- modules/core/pom.xml | 4 +- .../internal/interop/InteropIgnition.java | 31 ++-- .../processors/cache/CacheObjectImpl.java | 1 - .../dht/GridPartitionedGetFuture.java | 13 +- .../cache/CacheFutureExceptionSelfTest.java | 171 +++++++++++++++++++ .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + 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 + 11 files changed, 219 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a5654be4/parent/pom.xml ----------------------------------------------------------------------
