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/07/14 15:20:57 UTC
[4/4] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-901
Merge remote-tracking branch 'remotes/origin/master' into ignite-901
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d8d953f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d8d953f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d8d953f0
Branch: refs/heads/ignite-901
Commit: d8d953f0c3101ee5a081ce160b2a0c9254a2ce3c
Parents: c44e30b b19ed0c
Author: sboikov <sb...@gridgain.com>
Authored: Tue Jul 14 16:20:19 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Jul 14 16:20:19 2015 +0300
----------------------------------------------------------------------
examples/pom.xml | 2 +-
modules/aop/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
modules/clients/pom.xml | 2 +-
modules/cloud/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
.../processors/cache/GridCacheContext.java | 10 ++++----
.../dht/atomic/GridDhtAtomicCache.java | 4 +--
.../dht/atomic/GridNearAtomicUpdateFuture.java | 20 +++++++++++----
.../core/src/main/resources/ignite.properties | 2 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 2 +-
...acheAtomicReplicatedNodeRestartSelfTest.java | 15 -----------
modules/extdata/p2p/pom.xml | 2 +-
.../extdata/uri/modules/uri-dependency/pom.xml | 6 ++---
modules/extdata/uri/pom.xml | 26 ++++++++------------
modules/gce/pom.xml | 2 +-
modules/geospatial/pom.xml | 2 +-
modules/hadoop/pom.xml | 2 +-
modules/hibernate/pom.xml | 2 +-
modules/indexing/pom.xml | 2 +-
modules/jcl/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
modules/kafka/pom.xml | 2 +-
modules/log4j/pom.xml | 2 +-
modules/mesos/pom.xml | 2 +-
modules/rest-http/pom.xml | 2 +-
modules/scalar-2.10/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
modules/schedule/pom.xml | 2 +-
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spark-2.10/pom.xml | 2 +-
modules/spark/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
modules/urideploy/pom.xml | 2 +-
modules/visor-console-2.10/pom.xml | 2 +-
modules/visor-console/pom.xml | 2 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
modules/yardstick/pom.xml | 2 +-
pom.xml | 2 +-
44 files changed, 72 insertions(+), 85 deletions(-)
----------------------------------------------------------------------