You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/12/21 15:37:03 UTC

[6/6] ignite git commit: Merge branch 'ignite-1.5' into ignite-2213-1

Merge branch 'ignite-1.5' into ignite-2213-1


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

Branch: refs/heads/ignite-2213-1
Commit: 65acdf4940b1cb1d41731982595b3e3faf131c56
Parents: 12c8c2c 2848680
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Dec 21 17:37:34 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Dec 21 17:37:34 2015 +0300

----------------------------------------------------------------------
 modules/platforms/cpp/common/configure.ac       |  2 +-
 modules/platforms/cpp/core-test/configure.ac    |  2 +-
 modules/platforms/cpp/core/configure.ac         |  2 +-
 modules/platforms/cpp/examples/configure.ac     |  2 +-
 modules/platforms/cpp/ignite/configure.ac       |  2 +-
 .../Properties/AssemblyInfo.cs                  |  5 ++-
 .../Properties/AssemblyInfo.cs                  |  5 ++-
 .../Properties/AssemblyInfo.cs                  |  5 ++-
 .../Binary/IBinaryRawReader.cs                  |  4 +-
 .../Apache.Ignite.Core/Binary/IBinaryReader.cs  | 25 +-----------
 .../Apache.Ignite.Core/Binary/Package-Info.cs   |  2 +-
 .../Apache.Ignite.Core/Cache/Package-Info.cs    |  2 +-
 .../Cache/Query/Continuous/Package-Info.cs      |  2 +-
 .../Cache/Query/Package-Info.cs                 |  2 +-
 .../Cache/Store/Package-Info.cs                 |  2 +-
 .../Apache.Ignite.Core/Cluster/Package-Info.cs  |  2 +-
 .../Apache.Ignite.Core/Compute/Package-Info.cs  |  2 +-
 .../Datastream/Package-Info.cs                  |  2 +-
 .../Apache.Ignite.Core/Events/Package-Info.cs   |  2 +-
 .../Impl/Binary/BinaryReader.cs                 | 13 +++---
 .../Impl/Binary/BinaryUtils.cs                  |  4 +-
 .../Lifecycle/Package-Info.cs                   |  2 +-
 .../Messaging/Package-Info.cs                   |  2 +-
 .../dotnet/Apache.Ignite.Core/Package-Info.cs   |  2 +-
 .../Properties/AssemblyInfo.cs                  |  5 ++-
 .../Apache.Ignite.Core/Resource/Package-Info.cs |  2 +-
 .../Apache.Ignite.Core/Services/Package-Info.cs |  2 +-
 .../Transactions/Package-Info.cs                |  2 +-
 .../Apache.Ignite/Properties/AssemblyInfo.cs    |  5 ++-
 .../Properties/AssemblyInfo.cs                  |  5 ++-
 .../Properties/AssemblyInfo.cs                  |  5 ++-
 pom.xml                                         | 42 ++++++++++----------
 32 files changed, 74 insertions(+), 89 deletions(-)
----------------------------------------------------------------------