ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [2/2] ignite git commit: Merge branch 'master' into ignite-5896
Date Thu, 14 Sep 2017 18:43:30 GMT
Merge branch 'master' into ignite-5896

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientStringResponse.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/binary/ClientBinaryTypeGetRequest.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/binary/ClientBinaryTypeGetResponse.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/binary/ClientBinaryTypeNameGetRequest.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/binary/ClientBinaryTypeNamePutRequest.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/binary/ClientBinaryTypePutRequest.java
#	modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj


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

Branch: refs/heads/ignite-5896
Commit: d22d6ec4b582f9a8055274144cd60bbc1cf0c299
Parents: 54b1cc2 db88d6b
Author: devozerov <ppozerov@gmail.com>
Authored: Thu Sep 14 21:43:04 2017 +0300
Committer: devozerov <ppozerov@gmail.com>
Committed: Thu Sep 14 21:43:04 2017 +0300

----------------------------------------------------------------------
 .../processors/platform/client/ClientStringResponse.java    | 3 ++-
 .../platform/client/binary/ClientBinaryTypeGetRequest.java  | 2 +-
 .../platform/client/binary/ClientBinaryTypeGetResponse.java | 2 +-
 .../client/binary/ClientBinaryTypeNameGetRequest.java       | 9 +++++----
 .../client/binary/ClientBinaryTypeNamePutRequest.java       | 2 +-
 .../platform/client/binary/ClientBinaryTypePutRequest.java  | 2 +-
 6 files changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------



Mime
View raw message