Changeset 14164


Ignore:
Timestamp:
07/21/16 17:16:54 (8 months ago)
Author:
mkommend
Message:

#1087: Reverse merged changes in r14125 to hive solution and settings.

Location:
trunk/sources
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab 3.3 Hive.Slave.sln

    r14125 r14164  
    11
    22Microsoft Visual Studio Solution File, Format Version 12.00
    3 # Visual Studio 14
    4 VisualStudioVersion = 14.0.23107.0
    5 MinimumVisualStudioVersion = 10.0.40219.1
     3# Visual Studio 2012
    64Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Slave-3.3", "HeuristicLab.Clients.Hive.Slave\3.3\HeuristicLab.Clients.Hive.Slave-3.3.csproj", "{989FE92B-484E-41EE-87E2-6A24AF0381D8}"
    75EndProject
     
    2624  EndGlobalSection
    2725  GlobalSection(ProjectConfigurationPlatforms) = postSolution
    28     {989FE92B-484E-41EE-87E2-6A24AF0381D8}.Debug|Any CPU.ActiveCfg = Release|Any CPU
    29     {989FE92B-484E-41EE-87E2-6A24AF0381D8}.Debug|Any CPU.Build.0 = Release|Any CPU
    30     {989FE92B-484E-41EE-87E2-6A24AF0381D8}.Debug|x64.ActiveCfg = Release|Any CPU
    31     {989FE92B-484E-41EE-87E2-6A24AF0381D8}.Debug|x64.Build.0 = Release|Any CPU
    32     {989FE92B-484E-41EE-87E2-6A24AF0381D8}.Debug|x86.ActiveCfg = Release|Any CPU
    33     {989FE92B-484E-41EE-87E2-6A24AF0381D8}.Debug|x86.Build.0 = Release|Any CPU
     26    {989FE92B-484E-41EE-87E2-6A24AF0381D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     27    {989FE92B-484E-41EE-87E2-6A24AF0381D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
     28    {989FE92B-484E-41EE-87E2-6A24AF0381D8}.Debug|x64.ActiveCfg = Debug|x64
     29    {989FE92B-484E-41EE-87E2-6A24AF0381D8}.Debug|x64.Build.0 = Debug|x64
     30    {989FE92B-484E-41EE-87E2-6A24AF0381D8}.Debug|x86.ActiveCfg = Debug|x86
     31    {989FE92B-484E-41EE-87E2-6A24AF0381D8}.Debug|x86.Build.0 = Debug|x86
    3432    {989FE92B-484E-41EE-87E2-6A24AF0381D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
    3533    {989FE92B-484E-41EE-87E2-6A24AF0381D8}.Release|Any CPU.Build.0 = Release|Any CPU
    36     {989FE92B-484E-41EE-87E2-6A24AF0381D8}.Release|x64.ActiveCfg = Release|Any CPU
    37     {989FE92B-484E-41EE-87E2-6A24AF0381D8}.Release|x64.Build.0 = Release|Any CPU
    38     {989FE92B-484E-41EE-87E2-6A24AF0381D8}.Release|x86.ActiveCfg = Release|Any CPU
    39     {989FE92B-484E-41EE-87E2-6A24AF0381D8}.Release|x86.Build.0 = Release|Any CPU
    40     {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}.Debug|Any CPU.ActiveCfg = Release|Any CPU
    41     {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}.Debug|Any CPU.Build.0 = Release|Any CPU
    42     {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}.Debug|x64.ActiveCfg = Release|Any CPU
    43     {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}.Debug|x64.Build.0 = Release|Any CPU
    44     {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}.Debug|x86.ActiveCfg = Release|Any CPU
    45     {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}.Debug|x86.Build.0 = Release|Any CPU
     34    {989FE92B-484E-41EE-87E2-6A24AF0381D8}.Release|x64.ActiveCfg = Release|x64
     35    {989FE92B-484E-41EE-87E2-6A24AF0381D8}.Release|x64.Build.0 = Release|x64
     36    {989FE92B-484E-41EE-87E2-6A24AF0381D8}.Release|x86.ActiveCfg = Release|x86
     37    {989FE92B-484E-41EE-87E2-6A24AF0381D8}.Release|x86.Build.0 = Release|x86
     38    {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     39    {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
     40    {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}.Debug|x64.ActiveCfg = Debug|x64
     41    {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}.Debug|x64.Build.0 = Debug|x64
     42    {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}.Debug|x86.ActiveCfg = Debug|x86
     43    {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}.Debug|x86.Build.0 = Debug|x86
    4644    {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
    4745    {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}.Release|Any CPU.Build.0 = Release|Any CPU
    48     {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}.Release|x64.ActiveCfg = Release|Any CPU
    49     {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}.Release|x64.Build.0 = Release|Any CPU
    50     {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}.Release|x86.ActiveCfg = Release|Any CPU
    51     {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}.Release|x86.Build.0 = Release|Any CPU
    52     {E3B93D5C-3B6B-4657-9B3E-F4297BAC0AA5}.Debug|Any CPU.ActiveCfg = Release|Any CPU
    53     {E3B93D5C-3B6B-4657-9B3E-F4297BAC0AA5}.Debug|Any CPU.Build.0 = Release|Any CPU
    54     {E3B93D5C-3B6B-4657-9B3E-F4297BAC0AA5}.Debug|x64.ActiveCfg = Release|Any CPU
    55     {E3B93D5C-3B6B-4657-9B3E-F4297BAC0AA5}.Debug|x64.Build.0 = Release|Any CPU
    56     {E3B93D5C-3B6B-4657-9B3E-F4297BAC0AA5}.Debug|x86.ActiveCfg = Release|Any CPU
    57     {E3B93D5C-3B6B-4657-9B3E-F4297BAC0AA5}.Debug|x86.Build.0 = Release|Any CPU
     46    {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}.Release|x64.ActiveCfg = Release|x64
     47    {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}.Release|x64.Build.0 = Release|x64
     48    {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}.Release|x86.ActiveCfg = Release|x86
     49    {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}.Release|x86.Build.0 = Release|x86
     50    {E3B93D5C-3B6B-4657-9B3E-F4297BAC0AA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     51    {E3B93D5C-3B6B-4657-9B3E-F4297BAC0AA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
     52    {E3B93D5C-3B6B-4657-9B3E-F4297BAC0AA5}.Debug|x64.ActiveCfg = Debug|x64
     53    {E3B93D5C-3B6B-4657-9B3E-F4297BAC0AA5}.Debug|x64.Build.0 = Debug|x64
     54    {E3B93D5C-3B6B-4657-9B3E-F4297BAC0AA5}.Debug|x86.ActiveCfg = Debug|x86
     55    {E3B93D5C-3B6B-4657-9B3E-F4297BAC0AA5}.Debug|x86.Build.0 = Debug|x86
    5856    {E3B93D5C-3B6B-4657-9B3E-F4297BAC0AA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
    5957    {E3B93D5C-3B6B-4657-9B3E-F4297BAC0AA5}.Release|Any CPU.Build.0 = Release|Any CPU
    60     {E3B93D5C-3B6B-4657-9B3E-F4297BAC0AA5}.Release|x64.ActiveCfg = Release|Any CPU
    61     {E3B93D5C-3B6B-4657-9B3E-F4297BAC0AA5}.Release|x64.Build.0 = Release|Any CPU
    62     {E3B93D5C-3B6B-4657-9B3E-F4297BAC0AA5}.Release|x86.ActiveCfg = Release|Any CPU
    63     {E3B93D5C-3B6B-4657-9B3E-F4297BAC0AA5}.Release|x86.Build.0 = Release|Any CPU
    64     {464D70B8-2D91-485C-B622-22E4A4891C68}.Debug|Any CPU.ActiveCfg = Release|Any CPU
    65     {464D70B8-2D91-485C-B622-22E4A4891C68}.Debug|Any CPU.Build.0 = Release|Any CPU
    66     {464D70B8-2D91-485C-B622-22E4A4891C68}.Debug|x64.ActiveCfg = Release|Any CPU
    67     {464D70B8-2D91-485C-B622-22E4A4891C68}.Debug|x64.Build.0 = Release|Any CPU
    68     {464D70B8-2D91-485C-B622-22E4A4891C68}.Debug|x86.ActiveCfg = Release|Any CPU
    69     {464D70B8-2D91-485C-B622-22E4A4891C68}.Debug|x86.Build.0 = Release|Any CPU
     58    {E3B93D5C-3B6B-4657-9B3E-F4297BAC0AA5}.Release|x64.ActiveCfg = Release|x64
     59    {E3B93D5C-3B6B-4657-9B3E-F4297BAC0AA5}.Release|x64.Build.0 = Release|x64
     60    {E3B93D5C-3B6B-4657-9B3E-F4297BAC0AA5}.Release|x86.ActiveCfg = Release|x86
     61    {E3B93D5C-3B6B-4657-9B3E-F4297BAC0AA5}.Release|x86.Build.0 = Release|x86
     62    {464D70B8-2D91-485C-B622-22E4A4891C68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     63    {464D70B8-2D91-485C-B622-22E4A4891C68}.Debug|Any CPU.Build.0 = Debug|Any CPU
     64    {464D70B8-2D91-485C-B622-22E4A4891C68}.Debug|x64.ActiveCfg = Debug|x64
     65    {464D70B8-2D91-485C-B622-22E4A4891C68}.Debug|x64.Build.0 = Debug|x64
     66    {464D70B8-2D91-485C-B622-22E4A4891C68}.Debug|x86.ActiveCfg = Debug|x86
     67    {464D70B8-2D91-485C-B622-22E4A4891C68}.Debug|x86.Build.0 = Debug|x86
    7068    {464D70B8-2D91-485C-B622-22E4A4891C68}.Release|Any CPU.ActiveCfg = Release|Any CPU
    7169    {464D70B8-2D91-485C-B622-22E4A4891C68}.Release|Any CPU.Build.0 = Release|Any CPU
    72     {464D70B8-2D91-485C-B622-22E4A4891C68}.Release|x64.ActiveCfg = Release|Any CPU
    73     {464D70B8-2D91-485C-B622-22E4A4891C68}.Release|x64.Build.0 = Release|Any CPU
    74     {464D70B8-2D91-485C-B622-22E4A4891C68}.Release|x86.ActiveCfg = Release|Any CPU
    75     {464D70B8-2D91-485C-B622-22E4A4891C68}.Release|x86.Build.0 = Release|Any CPU
    76     {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Debug|Any CPU.ActiveCfg = Release|Any CPU
    77     {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Debug|Any CPU.Build.0 = Release|Any CPU
    78     {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Debug|x64.ActiveCfg = Release|Any CPU
    79     {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Debug|x64.Build.0 = Release|Any CPU
    80     {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Debug|x86.ActiveCfg = Release|Any CPU
    81     {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Debug|x86.Build.0 = Release|Any CPU
     70    {464D70B8-2D91-485C-B622-22E4A4891C68}.Release|x64.ActiveCfg = Release|x64
     71    {464D70B8-2D91-485C-B622-22E4A4891C68}.Release|x64.Build.0 = Release|x64
     72    {464D70B8-2D91-485C-B622-22E4A4891C68}.Release|x86.ActiveCfg = Release|x86
     73    {464D70B8-2D91-485C-B622-22E4A4891C68}.Release|x86.Build.0 = Release|x86
     74    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     75    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
     76    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Debug|x64.ActiveCfg = Debug|x64
     77    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Debug|x64.Build.0 = Debug|x64
     78    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Debug|x86.ActiveCfg = Debug|x86
     79    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Debug|x86.Build.0 = Debug|x86
    8280    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
    8381    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|Any CPU.Build.0 = Release|Any CPU
    84     {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|x64.ActiveCfg = Release|Any CPU
    85     {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|x64.Build.0 = Release|Any CPU
    86     {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|x86.ActiveCfg = Release|Any CPU
    87     {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|x86.Build.0 = Release|Any CPU
    88     {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Debug|Any CPU.ActiveCfg = Release|Any CPU
    89     {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Debug|Any CPU.Build.0 = Release|Any CPU
    90     {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Debug|x64.ActiveCfg = Release|Any CPU
    91     {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Debug|x64.Build.0 = Release|Any CPU
    92     {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Debug|x86.ActiveCfg = Release|Any CPU
    93     {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Debug|x86.Build.0 = Release|Any CPU
     82    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|x64.ActiveCfg = Release|x64
     83    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|x64.Build.0 = Release|x64
     84    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|x86.ActiveCfg = Release|x86
     85    {7C4B1DE4-FC9A-4448-BCF8-3CB3FA3CB8FA}.Release|x86.Build.0 = Release|x86
     86    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     87    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Debug|Any CPU.Build.0 = Debug|Any CPU
     88    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Debug|x64.ActiveCfg = Debug|x64
     89    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Debug|x64.Build.0 = Debug|x64
     90    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Debug|x86.ActiveCfg = Debug|x86
     91    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Debug|x86.Build.0 = Debug|x86
    9492    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|Any CPU.ActiveCfg = Release|Any CPU
    9593    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|Any CPU.Build.0 = Release|Any CPU
    96     {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|x64.ActiveCfg = Release|Any CPU
    97     {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|x64.Build.0 = Release|Any CPU
    98     {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|x86.ActiveCfg = Release|Any CPU
    99     {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|x86.Build.0 = Release|Any CPU
     94    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|x64.ActiveCfg = Release|x64
     95    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|x64.Build.0 = Release|x64
     96    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|x86.ActiveCfg = Release|x86
     97    {BA8001DE-E83C-4B1F-8B2E-2695C4222491}.Release|x86.Build.0 = Release|x86
    10098  EndGlobalSection
    10199  GlobalSection(SolutionProperties) = preSolution
  • trunk/sources/HeuristicLab.Clients.Hive.Slave/3.3/Properties/Settings.Designer.cs

    r14125 r14164  
    11//------------------------------------------------------------------------------
    22// <auto-generated>
    3 //     This code was generated by a tool.
    4 //     Runtime Version:4.0.30319.42000
     3//     Dieser Code wurde von einem Tool generiert.
     4//     Laufzeitversion:4.0.30319.42000
    55//
    6 //     Changes to this file may cause incorrect behavior and will be lost if
    7 //     the code is regenerated.
     6//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
     7//     der Code erneut generiert wird.
    88// </auto-generated>
    99//------------------------------------------------------------------------------
     
    266266        [global::System.Configuration.UserScopedSettingAttribute()]
    267267        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    268         [global::System.Configuration.DefaultSettingValueAttribute("4")]
     268        [global::System.Configuration.DefaultSettingValueAttribute("-1")]
    269269        public int NrOfCoresToScavenge {
    270270            get {
  • trunk/sources/HeuristicLab.Clients.Hive.Slave/3.3/Properties/Settings.settings

    r14125 r14164  
    6464    </Setting>
    6565    <Setting Name="NrOfCoresToScavenge" Type="System.Int32" Scope="User">
    66       <Value Profile="(Default)">4</Value>
     66      <Value Profile="(Default)">-1</Value>
    6767    </Setting>
    6868    <Setting Name="ShutdownCommand" Type="System.String" Scope="User">
Note: See TracChangeset for help on using the changeset viewer.