Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/18/14 13:34:37 (10 years ago)
Author:
ascheibe
Message:

merged only Hive changes from trunk into branch

Location:
branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave

    • Property svn:mergeinfo set to (toggle deleted branches)
      /trunk/sources/HeuristicLab.Clients.Hive.Slavemergedeligible
      /branches/Algorithms.GradientDescent/HeuristicLab.Clients.Hive.Slave5516-5520
      /branches/Benchmarking/sources/HeuristicLab.Clients.Hive.Slave6917-7005
      /branches/CloningRefactoring/HeuristicLab.Clients.Hive.Slave4656-4721
      /branches/DataAnalysis Refactoring/HeuristicLab.Clients.Hive.Slave5471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Clients.Hive.Slave5815-6180
      /branches/DataAnalysis/HeuristicLab.Clients.Hive.Slave4458-4459,​4462,​4464
      /branches/GP.Grammar.Editor/HeuristicLab.Clients.Hive.Slave6284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Clients.Hive.Slave5060
      /branches/NET40/sources/HeuristicLab.Clients.Hive.Slave5138-5162
      /branches/ParallelEngine/HeuristicLab.Clients.Hive.Slave5175-5192
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Clients.Hive.Slave7568-7810
      /branches/QAPAlgorithms/HeuristicLab.Clients.Hive.Slave6350-6627
      /branches/Restructure trunk solution/HeuristicLab.Clients.Hive.Slave6828
      /branches/RuntimeOptimizer/HeuristicLab.Clients.Hive.Slave8943-9078
      /branches/ScatterSearch (trunk integration)/HeuristicLab.Clients.Hive.Slave7787-8333
      /branches/SlaveShutdown/HeuristicLab.Clients.Hive.Slave8944-8956
      /branches/SuccessProgressAnalysis/HeuristicLab.Clients.Hive.Slave5370-5682
      /branches/Trunk/HeuristicLab.Clients.Hive.Slave6829-6865
      /branches/UnloadJobs/HeuristicLab.Clients.Hive.Slave9168-9215
      /branches/VNS/HeuristicLab.Clients.Hive.Slave5594-5752
      /branches/histogram/HeuristicLab.Clients.Hive.Slave5959-6341

  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave/3.3/Properties/Settings.settings

    r11203 r11204  
    33  <Profiles />
    44  <Settings>
    5     <Setting Name="HeartbeatInterval" Type="System.TimeSpan" Scope="User">
    6       <Value Profile="(Default)">00:00:30</Value>
    7     </Setting>
    85    <Setting Name="LastUsedFileName" Type="System.String" Scope="User">
    96      <Value Profile="(Default)">lastUsed.dat</Value>
    … …  
    7875      <Value Profile="(Default)">shutdown.exe</Value>
    7976    </Setting>
     77    <Setting Name="HeartbeatInterval" Type="System.TimeSpan" Scope="User">
     78      <Value Profile="(Default)">00:00:40</Value>
     79    </Setting>
    8080  </Settings>
    8181</SettingsFile>
Note: See TracChangeset for help on using the changeset viewer.