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/09/10 09:46:50 UTC
[4/4] ignite git commit: Merge remote-tracking branch 'origin/master'
into ignite-971
Merge remote-tracking branch 'origin/master' into ignite-971
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1feff74f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1feff74f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1feff74f
Branch: refs/heads/master
Commit: 1feff74f4df3a903dcce411d727606672bc36f5b
Parents: 4a3b024 45df2a7
Author: sboikov <sb...@gridgain.com>
Authored: Thu Sep 10 10:46:38 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Sep 10 10:46:38 2015 +0300
----------------------------------------------------------------------
examples/platform/cpp/Makefile.am | 39 ------
examples/platform/cpp/README.txt | 42 -------
examples/platform/cpp/configure.ac | 30 -----
examples/platform/cpp/include/Makefile.am | 21 ----
.../cpp/include/ignite/examples/address.h | 109 ----------------
.../cpp/include/ignite/examples/organization.h | 111 ----------------
.../platform/cpp/project/vs/ignite-examples.sln | 19 ---
.../cpp/project/vs/ignite-examples.vcxproj | 107 ----------------
.../project/vs/ignite-examples.vcxproj.filters | 30 -----
examples/platform/cpp/src/putgetexample.cpp | 126 -------------------
.../configuration/IgniteConfiguration.java | 22 ----
.../configuration/PlatformConfiguration.java | 25 ----
.../apache/ignite/internal/IgniteKernal.java | 8 +-
.../platform/PlatformConfiguration.java | 25 ++++
.../dotnet/PlatformDotNetConfiguration.java | 2 +-
.../platform/PlatformProcessorImpl.java | 3 +-
.../cpp/PlatformCppConfigurationClosure.java | 6 +-
.../PlatformDotNetConfigurationClosure.java | 6 +-
.../platform/cpp/PlatformCppConfiguration.java | 2 +-
19 files changed, 39 insertions(+), 694 deletions(-)
----------------------------------------------------------------------