ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [11/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1-2
Date Mon, 11 Jan 2016 05:57:41 GMT
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1-2

Conflicts:
	modules/platforms/cpp/common/configure.ac
	modules/platforms/cpp/core-test/configure.ac
	modules/platforms/cpp/core/configure.ac
	modules/platforms/cpp/examples/configure.ac
	modules/platforms/cpp/ignite/configure.ac


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

Branch: refs/heads/ignite-1537
Commit: ad5bcec935b20421effb4ad5886e39549921fe99
Parents: 9f1f660 e586923
Author: Anton Vinogradov <av@apache.org>
Authored: Mon Dec 21 16:40:55 2015 +0300
Committer: Anton Vinogradov <av@apache.org>
Committed: Mon Dec 21 16:40:55 2015 +0300

----------------------------------------------------------------------
 .../Properties/AssemblyInfo.cs                  |  5 ++-
 .../Properties/AssemblyInfo.cs                  |  5 ++-
 .../Properties/AssemblyInfo.cs                  |  5 ++-
 .../Binary/IBinaryRawReader.cs                  |  4 +-
 .../Apache.Ignite.Core/Binary/IBinaryReader.cs  | 25 +-----------
 .../Impl/Binary/BinaryReader.cs                 | 13 +++---
 .../Impl/Binary/BinaryUtils.cs                  |  4 +-
 .../Properties/AssemblyInfo.cs                  |  5 ++-
 .../Apache.Ignite/Properties/AssemblyInfo.cs    |  5 ++-
 .../Properties/AssemblyInfo.cs                  |  5 ++-
 .../Properties/AssemblyInfo.cs                  |  5 ++-
 pom.xml                                         | 42 ++++++++++----------
 12 files changed, 54 insertions(+), 69 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/ad5bcec9/pom.xml
----------------------------------------------------------------------


Mime
View raw message