Context Navigation

← Previous Change
Next Change →

Settings.settings

Timestamp:

12/15/18 12:07:16 (6 years ago)

Author:

gkronber

Message:

#2925 merged changes r15972:16382 from trunk to branch

Location:

branches/2925_AutoDiffForDynamicalModels

Files:

: 3 edited

. (modified) (1 prop)
HeuristicLab.Services.Hive.DataAccess (modified) (1 prop)
HeuristicLab.Services.Hive.DataAccess/3.3/Settings.settings (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed

branches/2925_AutoDiffForDynamicalModels

Property svn:mergeinfo changed

/branches/2839_HiveProjectManagement (added)	merged: 15761,15767-15768,15777,15792,15813,15819,15908,15913-15914,15920,15922,15925,15933,15953-15956,15966,15969,15978,15992,15995,16040,16043-16044,16050,16057,16060,16062,16064,16066,16068,16072,16089,16091-16095,16116
/branches/2915-AbsoluteSymbol (added)	merged: 15943-15944,16236-16240,16304,16306,16332,16344-16352,16355
/branches/2916_IndexedDataTableSerialization (added)	merged: 15918
/branches/2937_SymReg_AnalyticalQuotient (added)	merged: 16083
/branches/HiveProjectManagement (added)	merged: 15377-15380,15399,15401,15411-15412,15422,15496-15497,15500,15503,15508,15523,15526-15528,15530,15540,15546-15547,15552,15557,15559,15567,15576-15577,15580,15627-15628,15630,15641-15644,15658-15659,15666,15671,15715-15716,15737,15742,15760
/stable (added)	merged: 15587-15588
/trunk (added)	merged: 15972,15983,15998-15999,16015,16021,16023-16025,16032-16033,16054,16059,16063,16071,16084-16086,16117-16118,16120,16122,16168-16169,16177,16179,16184-16187,16202-16209,16211,16213,16216,16218-16219,16221,16223-16224,16232,16241-16244,16252,16255,16257-16261,16263-16264,16266-16267,16269-16274,16276-16280,16283-16287,16289-16294,16296-16298,16301-16302,16305,16309,16333-16334,16341-16343,16356-16362,16365-16366,16378-16379,16381-16382
/trunk/sources (added)	merged: 15589-15590

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Services.Hive.DataAccess

Property svn:mergeinfo changed

/branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess (added)	merged: 15908,15966,15978,16050,16057,16091
/branches/2915-AbsoluteSymbol/HeuristicLab.Services.Hive.DataAccess (added)	merged: 16240,16332
/branches/HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess (added)	merged: 15378-15379,15399,15411,15496-15497,15500,15503,15508,15523,15526-15528,15530,15540,15546,15552,15577,15628,15630,15643-15644,15658-15659,15666,15671,15715,15737,15760
/trunk/HeuristicLab.Services.Hive.DataAccess (added)	merged: 16117,16257,16356

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Services.Hive.DataAccess/3.3/Settings.settings

-                      r14748
+                      r16386
   <Profiles />
   <Settings>
-    <Setting Name="HeuristicLab_Hive_LinqConnectionString" Type="(Connection string)" Scope="Application">
-      <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
-&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Hive-3.3&lt;/ConnectionString&gt;
-  &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
-&lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Hive-3.3</Value>
-    </Setting>
     <Setting Name="LongRunningDatabaseCommandTimeout" Type="System.TimeSpan" Scope="Application">
       <Value Profile="(Default)">00:05:00</Value>
 …
       <Value Profile="(Default)">HL.Hive</Value>
     </Setting>
+    <Setting Name="HeuristicLab_Hive_LinqConnectionString" Type="(Connection string)" Scope="Application">
+      <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
+&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
+  &lt;ConnectionString&gt;Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Hive-3.4&lt;/ConnectionString&gt;
+&lt;/SerializableConnectionString&gt;</DesignTimeValue>
+      <Value Profile="(Default)">Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Hive-3.4</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 16386 for branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Services.Hive.DataAccess/3.3/Settings.settings

Legend:

branches/2925_AutoDiffForDynamicalModels

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Services.Hive.DataAccess

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Services.Hive.DataAccess/3.3/Settings.settings

Download in other formats: