Changeset 16388 for branches/2892_LR-prediction-intervals/HeuristicLab.Clients.Hive.Slave.WindowsService

Timestamp:

12/15/18 12:36:08 (6 years ago)

Author:

gkronber

Message:

#2892: Merging r15750:16382 (HEAD) from trunk to branch, resolving conflicts

Location:

branches/2892_LR-prediction-intervals

Files:

• . (modified) (3 props)
• HeuristicLab.Clients.Hive.Slave.WindowsService (modified) (1 prop)
• HeuristicLab.Clients.Hive.Slave.WindowsService/3.3/app.config (modified) (2 diffs)

branches/2892_LR-prediction-intervals

@@ +1 @@
+*.docstates
+*.psess
+*.resharper
+*.suo
+*.user
+*.vsp
+Doxygen
+FxCopResults.txt
+Google.ProtocolBuffers-0.9.1.dll
+Google.ProtocolBuffers-2.4.1.473.dll
+HeuristicLab 3.3.5.1.ReSharper.user
+HeuristicLab 3.3.6.0.ReSharper.user
+HeuristicLab.4.5.resharper.user
+HeuristicLab.ExtLibs.6.0.ReSharper.user
+HeuristicLab.Scripting.Development
+HeuristicLab.resharper.user
+ProtoGen.exe
 TestResults
+_ReSharper.HeuristicLab
+_ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab 3.3 Tests
+_ReSharper.HeuristicLab.ExtLibs
+bin
+protoc.exe
+obj
+.vs

@@ +1 @@
+*.docstates
+*.psess
+*.resharper
+*.suo
+*.user
+*.vsp
+Doxygen
+FxCopResults.txt
+Google.ProtocolBuffers-0.9.1.dll
+Google.ProtocolBuffers-2.4.1.473.dll
+HeuristicLab 3.3.5.1.ReSharper.user
+HeuristicLab 3.3.6.0.ReSharper.user
+HeuristicLab.4.5.resharper.user
+HeuristicLab.ExtLibs.6.0.ReSharper.user
+HeuristicLab.Scripting.Development
+HeuristicLab.resharper.user
+ProtoGen.exe
 TestResults
+_ReSharper.HeuristicLab
+_ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab 3.3 Tests
+_ReSharper.HeuristicLab.ExtLibs
+bin
+protoc.exe
+obj
+.vs

branches/2892_LR-prediction-intervals/HeuristicLab.Clients.Hive.Slave.WindowsService/3.3/app.config

@@ -150 +150 @@
     <client>
       <endpoint name="SlaveCommunicationServiceEndpoint" address="net.pipe://localhost/HeuristicLabSlaveCom" binding="netNamedPipeBinding" contract="HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts.ISlaveCommunication"/>
-      <endpoint address="http://services.heuristiclab.com/Hive-3.3/HiveService.svc"
+      <endpoint address="http://services.heuristiclab.com/Hive-3.4/HiveService.svc"
         binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IHiveService"
         contract="HeuristicLab.Clients.Hive.IHiveService" name="WSHttpBinding_IHiveService">
@@ -157 +157 @@
         </identity>
       </endpoint>
-      <endpoint address="net.tcp://services.heuristiclab.com/Hive-3.3/HiveService.svc"
+      <endpoint address="net.tcp://services.heuristiclab.com/Hive-3.4/HiveService.svc"
         binding="netTcpBinding" bindingConfiguration="NetBinding_IHiveService"
         contract="HeuristicLab.Clients.Hive.IHiveService" name="NetBinding_IHiveService">

@@ +1 @@
+*.docstates
+*.psess
+*.resharper
+*.suo
+*.user
+*.vsp
+Doxygen
+FxCopResults.txt
+Google.ProtocolBuffers-0.9.1.dll
+Google.ProtocolBuffers-2.4.1.473.dll
+HeuristicLab 3.3.5.1.ReSharper.user
+HeuristicLab 3.3.6.0.ReSharper.user
+HeuristicLab.4.5.resharper.user
+HeuristicLab.ExtLibs.6.0.ReSharper.user
+HeuristicLab.Scripting.Development
+HeuristicLab.resharper.user
+ProtoGen.exe
 TestResults
+_ReSharper.HeuristicLab
+_ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab 3.3 Tests
+_ReSharper.HeuristicLab.ExtLibs
+bin
+protoc.exe
+obj
+.vs