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/09/08 14:30:41 UTC
[1/2] ignite git commit: Corrected platform toolset for CPP common
project.
Repository: ignite
Updated Branches:
refs/heads/master 27150575e -> e75555459
Corrected platform toolset for CPP common project.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5dd785b8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5dd785b8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5dd785b8
Branch: refs/heads/master
Commit: 5dd785b86e091ea7be2f096fa03f48c92dbe82a7
Parents: f03a530
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Sep 8 15:30:56 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Sep 8 15:30:56 2015 +0300
----------------------------------------------------------------------
.../platform/src/main/cpp/common/project/vs/common.vcxproj | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5dd785b8/modules/platform/src/main/cpp/common/project/vs/common.vcxproj
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/common/project/vs/common.vcxproj b/modules/platform/src/main/cpp/common/project/vs/common.vcxproj
index ddc0019..b7cfb8a 100644
--- a/modules/platform/src/main/cpp/common/project/vs/common.vcxproj
+++ b/modules/platform/src/main/cpp/common/project/vs/common.vcxproj
@@ -27,26 +27,26 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v100</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v100</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v100</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v100</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
[2/2] ignite git commit: Merge remote-tracking branch 'origin/master'
Posted by vo...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e7555545
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e7555545
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e7555545
Branch: refs/heads/master
Commit: e755554598526e0c0d4dd0a46d5f7f3354195ff7
Parents: 5dd785b 2715057
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Sep 8 15:31:24 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Sep 8 15:31:24 2015 +0300
----------------------------------------------------------------------
...cheAbstractFullApiMultithreadedSelfTest.java | 63 +++++++++++++-------
...PartitionedFullApiMultithreadedSelfTest.java | 5 --
...eReplicatedFullApiMultithreadedSelfTest.java | 5 --
...dCacheLocalFullApiMultithreadedSelfTest.java | 5 --
4 files changed, 40 insertions(+), 38 deletions(-)
----------------------------------------------------------------------