- Timestamp:
- 09/14/18 11:47:37 (6 years ago)
- Location:
- branches/2817-BinPackingSpeedup
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2817-BinPackingSpeedup
- Property svn:mergeinfo changed
-
branches/2817-BinPackingSpeedup/HeuristicLab.Services.OKB.DataAccess
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/2839_HiveProjectManagement/HeuristicLab.Services.OKB.DataAccess merged eligible /stable/HeuristicLab.Services.OKB.DataAccess merged eligible /trunk/HeuristicLab.Services.OKB.DataAccess merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.Services.OKB.DataAccess 10321-10322 /branches/Algorithms.GradientDescent/HeuristicLab.Services.OKB.DataAccess 5516-5520 /branches/Async/HeuristicLab.Services.OKB.DataAccess 13329-15286 /branches/Benchmarking/sources/HeuristicLab.Services.OKB.DataAccess 6917-7005 /branches/CloningRefactoring/HeuristicLab.Services.OKB.DataAccess 4656-4721 /branches/CodeEditor/HeuristicLab.Services.OKB.DataAccess 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.Services.OKB.DataAccess 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Services.OKB.DataAccess 5815-6180 /branches/DataAnalysis/HeuristicLab.Services.OKB.DataAccess 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.Services.OKB.DataAccess 10085-11101 /branches/GP.Grammar.Editor/HeuristicLab.Services.OKB.DataAccess 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Services.OKB.DataAccess 5060 /branches/HLScript/HeuristicLab.Services.OKB.DataAccess 10331-10358 /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Services.OKB.DataAccess 11570-12508 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Services.OKB.DataAccess 6123-9799 /branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Services.OKB.DataAccess 11130-12721 /branches/HiveStatistics/sources/HeuristicLab.Services.OKB.DataAccess 12440-12877 /branches/LogResidualEvaluator/HeuristicLab.Services.OKB.DataAccess 10202-10483 /branches/NET40/sources/HeuristicLab.Services.OKB.DataAccess 5138-5162 /branches/NSGA-II Changes/HeuristicLab.Services.OKB.DataAccess 12033-12122 /branches/ParallelEngine/HeuristicLab.Services.OKB.DataAccess 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Services.OKB.DataAccess 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Services.OKB.DataAccess 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Services.OKB.DataAccess 6828 /branches/RuntimeOptimizer/HeuristicLab.Services.OKB.DataAccess 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Services.OKB.DataAccess 7787-8333 /branches/SlaveShutdown/HeuristicLab.Services.OKB.DataAccess 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Services.OKB.DataAccess 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.Services.OKB.DataAccess 5370-5682 /branches/Trunk/HeuristicLab.Services.OKB.DataAccess 6829-6865 /branches/UnloadJobs/HeuristicLab.Services.OKB.DataAccess 9168-9215 /branches/VNS/HeuristicLab.Services.OKB.DataAccess 5594-5752 /branches/crossvalidation-2434/HeuristicLab.Services.OKB.DataAccess 12948-12950 /branches/histogram/HeuristicLab.Services.OKB.DataAccess 5959-6341 /branches/symbreg-factors-2650/HeuristicLab.Services.OKB.DataAccess 14232-14825
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2817-BinPackingSpeedup/HeuristicLab.Services.OKB.DataAccess/3.3/OKB.dbml
r14748 r16141 1 1 <?xml version="1.0" encoding="utf-8"?><Database Name="HeuristicLab.OKB" EntityNamespace="HeuristicLab.Services.OKB.DataAccess" ContextNamespace="HeuristicLab.Services.OKB.DataAccess" Class="OKBDataContext" xmlns="http://schemas.microsoft.com/linqtosql/dbml/2007"> 2 <Connection Mode="AppSettings" ConnectionString="Data Source= .\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB" SettingsObjectName="HeuristicLab.Services.OKB.DataAccess.Properties.Settings" SettingsPropertyName="OKBConnectionString" Provider="System.Data.SqlClient" />2 <Connection Mode="AppSettings" ConnectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB" SettingsObjectName="HeuristicLab.Services.OKB.DataAccess.Properties.Settings" SettingsPropertyName="OKBConnectionString" Provider="System.Data.SqlClient" /> 3 3 <Table Name="dbo.AlgorithmClass" Member="AlgorithmClasses"> 4 4 <Type Name="AlgorithmClass"> -
branches/2817-BinPackingSpeedup/HeuristicLab.Services.OKB.DataAccess/3.3/Properties/Settings.Designer.cs
r11623 r16141 2 2 // <auto-generated> 3 3 // This code was generated by a tool. 4 // Runtime Version:4.0.30319. 340144 // Runtime Version:4.0.30319.42000 5 5 // 6 6 // Changes to this file may cause incorrect behavior and will be lost if … … 13 13 14 14 [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] 15 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "1 2.0.0.0")]15 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")] 16 16 public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { 17 17 … … 27 27 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 28 28 [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)] 29 [global::System.Configuration.DefaultSettingValueAttribute("Data Source=.\\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OK" + 30 "B")] 29 [global::System.Configuration.DefaultSettingValueAttribute("Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB")] 31 30 public string OKBConnectionString { 32 31 get { -
branches/2817-BinPackingSpeedup/HeuristicLab.Services.OKB.DataAccess/3.3/Properties/Settings.settings
r8049 r16141 6 6 <DesignTimeValue Profile="(Default)"><?xml version="1.0" encoding="utf-16"?> 7 7 <SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> 8 <ConnectionString>Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB</ConnectionString> 9 <ProviderName>System.Data.SqlClient</ProviderName> 8 <ConnectionString>Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB</ConnectionString> 10 9 </SerializableConnectionString></DesignTimeValue> 11 <Value Profile="(Default)">Data Source= .\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB</Value>10 <Value Profile="(Default)">Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB</Value> 12 11 </Setting> 13 12 </Settings> -
branches/2817-BinPackingSpeedup/HeuristicLab.Services.OKB.DataAccess/3.3/app.config
r14748 r16141 1 1 <?xml version="1.0" encoding="utf-8"?> 2 2 <configuration> 3 <configSections> 4 </configSections> 3 5 <connectionStrings> 4 <add name="HeuristicLab.Services.OKB.DataAccess.Properties.Settings.OKBConnectionString" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB" /> 6 <add name="HeuristicLab.Services.OKB.DataAccess.Properties.Settings.OKBConnectionString" 7 connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB" /> 5 8 </connectionStrings> 6 9
Note: See TracChangeset
for help on using the changeset viewer.