ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [29/39] ignite git commit: Merge branch 'ignite-1.4'
Date Mon, 07 Sep 2015 22:50:41 GMT
Merge branch 'ignite-1.4'

Conflicts:
	examples/pom.xml
	modules/aop/pom.xml
	modules/apache-license-gen/pom.xml
	modules/aws/pom.xml
	modules/clients/pom.xml
	modules/cloud/pom.xml
	modules/codegen/pom.xml
	modules/core/pom.xml
	modules/core/src/main/resources/ignite.properties
	modules/extdata/p2p/pom.xml
	modules/extdata/uri/modules/uri-dependency/pom.xml
	modules/extdata/uri/pom.xml
	modules/gce/pom.xml
	modules/geospatial/pom.xml
	modules/hadoop/pom.xml
	modules/hibernate/pom.xml
	modules/indexing/pom.xml
	modules/jcl/pom.xml
	modules/jms11/pom.xml
	modules/jta/pom.xml
	modules/kafka/pom.xml
	modules/log4j/pom.xml
	modules/log4j2/pom.xml
	modules/mesos/pom.xml
	modules/platform/pom.xml
	modules/platform/src/main/cpp/common/configure.ac
	modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
	modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
	modules/rest-http/pom.xml
	modules/scalar-2.10/pom.xml
	modules/scalar/pom.xml
	modules/schedule/pom.xml
	modules/schema-import/pom.xml
	modules/slf4j/pom.xml
	modules/spark-2.10/pom.xml
	modules/spark/pom.xml
	modules/spring/pom.xml
	modules/ssh/pom.xml
	modules/tools/pom.xml
	modules/urideploy/pom.xml
	modules/visor-console-2.10/pom.xml
	modules/visor-console/pom.xml
	modules/visor-plugins/pom.xml
	modules/web/pom.xml
	modules/yardstick/pom.xml
	modules/yarn/pom.xml
	modules/zookeeper/pom.xml
	pom.xml


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

Branch: refs/heads/ignite-843
Commit: 8b214d5d2cd4253ca02f6118b5c434314b569380
Parents: 2b16b57 55027dc
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Mon Sep 7 10:39:13 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Mon Sep 7 10:39:13 2015 +0300

----------------------------------------------------------------------
 RELEASE_NOTES.txt                               |  13 +-
 .../messaging/MessagingPingPongExample.java     |   6 +-
 .../CacheClientPortableQueryExample.java        |   3 -
 .../messaging/MessagingPingPongExample.java     |   2 +-
 .../examples/MessagingExamplesSelfTest.java     |   3 +-
 .../examples/MessagingExamplesSelfTest.java     |   3 +-
 .../apache/ignite/internal/IgniteKernal.java    |   2 +-
 .../ignite/internal/MarshallerContextImpl.java  |  31 ++--
 .../distributed/dht/GridDhtLocalPartition.java  |  51 +++++-
 .../dht/GridPartitionedGetFuture.java           |  14 +-
 .../distributed/near/GridNearGetFuture.java     |  13 ++
 .../query/GridCacheDistributedQueryFuture.java  |   5 +-
 .../query/GridCacheDistributedQueryManager.java |   9 +-
 .../cache/query/GridCacheQueryManager.java      | 177 ++++++-------------
 .../cache/query/GridCacheQueryRequest.java      |  59 ++++++-
 .../visor/cache/VisorCacheStartTask.java        |   6 +-
 .../messages/TcpDiscoveryClientAckResponse.java |   2 +-
 .../cache/GridCacheIncrementTransformTest.java  |   2 +-
 .../IgniteCacheP2pUnmarshallingErrorTest.java   |   5 -
 .../IgniteCacheNodeJoinAbstractTest.java        |  42 +++++
 .../Properties/AssemblyInfo.cs                  |   2 +-
 .../Properties/AssemblyInfo.cs                  |   2 +-
 22 files changed, 276 insertions(+), 176 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/8b214d5d/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --cc modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
index 0de6294,7d2d4cc..5dbfce9
--- a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
+++ b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
@@@ -1,4 -1,4 +1,4 @@@
--/*
++/*
   * Licensed to the Apache Software Foundation (ASF) under one or more
   * contributor license agreements.  See the NOTICE file distributed with
   * this work for additional information regarding copyright ownership.

http://git-wip-us.apache.org/repos/asf/ignite/blob/8b214d5d/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --cc modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
index bfaf7f2,b8eb3b8..1ebcf24
--- a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
+++ b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
@@@ -1,4 -1,4 +1,4 @@@
--/*
++/*
   * Licensed to the Apache Software Foundation (ASF) under one or more
   * contributor license agreements.  See the NOTICE file distributed with
   * this work for additional information regarding copyright ownership.


Mime
View raw message