Changeset 16141 for branches/2817-BinPackingSpeedup/HeuristicLab.Services.Access.DataAccess/3.3/Properties
- Timestamp:
- 09/14/18 11:47:37 (6 years ago)
- Location:
- branches/2817-BinPackingSpeedup
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2817-BinPackingSpeedup
- Property svn:mergeinfo changed
-
branches/2817-BinPackingSpeedup/HeuristicLab.Services.Access.DataAccess
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/2839_HiveProjectManagement/HeuristicLab.Services.Access.DataAccess merged eligible /stable/HeuristicLab.Services.Access.DataAccess merged eligible /trunk/HeuristicLab.Services.Access.DataAccess merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.Services.Access.DataAccess 10321-10322 /branches/Algorithms.GradientDescent/HeuristicLab.Services.Access.DataAccess 5516-5520 /branches/Async/HeuristicLab.Services.Access.DataAccess 13329-15286 /branches/Benchmarking/sources/HeuristicLab.Services.Access.DataAccess 6917-7005 /branches/CloningRefactoring/HeuristicLab.Services.Access.DataAccess 4656-4721 /branches/CodeEditor/HeuristicLab.Services.Access.DataAccess 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.Services.Access.DataAccess 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Services.Access.DataAccess 5815-6180 /branches/DataAnalysis/HeuristicLab.Services.Access.DataAccess 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.Services.Access.DataAccess 10085-11101 /branches/GP.Grammar.Editor/HeuristicLab.Services.Access.DataAccess 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Services.Access.DataAccess 5060 /branches/HLScript/HeuristicLab.Services.Access.DataAccess 10331-10358 /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Services.Access.DataAccess 11570-12508 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Services.Access.DataAccess 6123-9799 /branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Services.Access.DataAccess 11130-12721 /branches/HiveProjectManagement/HeuristicLab.Services.Access.DataAccess 15377-15760 /branches/HiveStatistics/sources/HeuristicLab.Services.Access.DataAccess 12440-12877 /branches/LogResidualEvaluator/HeuristicLab.Services.Access.DataAccess 10202-10483 /branches/NET40/sources/HeuristicLab.Services.Access.DataAccess 5138-5162 /branches/NSGA-II Changes/HeuristicLab.Services.Access.DataAccess 12033-12122 /branches/ParallelEngine/HeuristicLab.Services.Access.DataAccess 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Services.Access.DataAccess 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Services.Access.DataAccess 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Services.Access.DataAccess 6828 /branches/RuntimeOptimizer/HeuristicLab.Services.Access.DataAccess 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Services.Access.DataAccess 7787-8333 /branches/SlaveShutdown/HeuristicLab.Services.Access.DataAccess 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Services.Access.DataAccess 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.Services.Access.DataAccess 5370-5682 /branches/Trunk/HeuristicLab.Services.Access.DataAccess 6829-6865 /branches/UnloadJobs/HeuristicLab.Services.Access.DataAccess 9168-9215 /branches/VNS/HeuristicLab.Services.Access.DataAccess 5594-5752 /branches/crossvalidation-2434/HeuristicLab.Services.Access.DataAccess 12948-12950 /branches/histogram/HeuristicLab.Services.Access.DataAccess 5959-6341 /branches/symbreg-factors-2650/HeuristicLab.Services.Access.DataAccess 14232-14825
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2817-BinPackingSpeedup/HeuristicLab.Services.Access.DataAccess/3.3/Properties/Settings.Designer.cs
r14748 r16141 13 13 14 14 [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] 15 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "1 4.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.Ac" +30 " cessService")]29 [global::System.Configuration.DefaultSettingValueAttribute("Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Acces" + 30 "sService")] 31 31 public string HeuristicLab_ClientManagementConnectionString { 32 32 get { … … 38 38 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 39 39 [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)] 40 [global::System.Configuration.DefaultSettingValueAttribute("Data Source= .\\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Au" +41 " thentication")]40 [global::System.Configuration.DefaultSettingValueAttribute("Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authe" + 41 "ntication")] 42 42 public string HeuristicLab_AuthenticationConnectionString { 43 43 get { -
branches/2817-BinPackingSpeedup/HeuristicLab.Services.Access.DataAccess/3.3/Properties/Settings.settings
r14748 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.AccessService</ConnectionString> 9 <ProviderName>System.Data.SqlClient</ProviderName> 8 <ConnectionString>Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.AccessService</ConnectionString> 10 9 </SerializableConnectionString></DesignTimeValue> 11 <Value Profile="(Default)">Data Source= .\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.AccessService</Value>10 <Value Profile="(Default)">Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.AccessService</Value> 12 11 </Setting> 13 12 <Setting Name="HeuristicLab_AuthenticationConnectionString" Type="(Connection string)" Scope="Application"> 14 13 <DesignTimeValue Profile="(Default)"><?xml version="1.0" encoding="utf-16"?> 15 14 <SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> 16 <ConnectionString>Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication</ConnectionString> 17 <ProviderName>System.Data.SqlClient</ProviderName> 15 <ConnectionString>Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication</ConnectionString> 18 16 </SerializableConnectionString></DesignTimeValue> 19 <Value Profile="(Default)">Data Source= .\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication</Value>17 <Value Profile="(Default)">Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication</Value> 20 18 </Setting> 21 19 </Settings>
Note: See TracChangeset
for help on using the changeset viewer.