- Timestamp:
- 04/16/13 13:13:41 (11 years ago)
- Location:
- branches/OaaS
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/OaaS
- Property svn:ignore
-
old new 21 21 protoc.exe 22 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll 23 24 packages
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Services.Hive.DataAccess
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/sources/HeuristicLab.Services.Hive.DataAccess merged eligible /branches/Algorithms.GradientDescent/HeuristicLab.Services.Hive.DataAccess 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Services.Hive.DataAccess 6917-7005 /branches/CloningRefactoring/HeuristicLab.Services.Hive.DataAccess 4656-4721 /branches/DataAnalysis Refactoring/HeuristicLab.Services.Hive.DataAccess 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Services.Hive.DataAccess 5815-6180 /branches/DataAnalysis/HeuristicLab.Services.Hive.DataAccess 4458-4459,4462,4464 /branches/GP.Grammar.Editor/HeuristicLab.Services.Hive.DataAccess 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Services.Hive.DataAccess 5060 /branches/HiveTaskScheduler/HeuristicLab.Services.Hive.DataAccess 8687-9106 /branches/NET40/sources/HeuristicLab.Services.Hive.DataAccess 5138-5162 /branches/ParallelEngine/HeuristicLab.Services.Hive.DataAccess 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Services.Hive.DataAccess 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Services.Hive.DataAccess 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Services.Hive.DataAccess 6828 /branches/RuntimeOptimizer/HeuristicLab.Services.Hive.DataAccess 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Services.Hive.DataAccess 7787-8333 /branches/SlaveShutdown/HeuristicLab.Services.Hive.DataAccess 8944-8956 /branches/SuccessProgressAnalysis/HeuristicLab.Services.Hive.DataAccess 5370-5682 /branches/Trunk/HeuristicLab.Services.Hive.DataAccess 6829-6865 /branches/UnloadJobs/HeuristicLab.Services.Hive.DataAccess 9168-9215 /branches/VNS/HeuristicLab.Services.Hive.DataAccess 5594-5752 /branches/histogram/HeuristicLab.Services.Hive.DataAccess 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/OaaS/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.dbml
r7916 r9363 42 42 <Association Name="Resource_Downtime" Member="Downtimes" Storage="_UptimeCalendars" ThisKey="ResourceId" OtherKey="ResourceId" Type="Downtime" /> 43 43 <Association Name="Resource_StateLog" Member="StateLogs" ThisKey="ResourceId" OtherKey="SlaveId" Type="StateLog" /> 44 <Association Name="Resource_ SlavePermission" Member="ResourcePermissions" ThisKey="ResourceId" OtherKey="ResourceId" Type="ResourcePermission" />44 <Association Name="Resource_ResourcePermission" Member="ResourcePermissions" ThisKey="ResourceId" OtherKey="ResourceId" Type="ResourcePermission" /> 45 45 <Association Name="Resource_Resource" Member="ParentResource" ThisKey="ParentResourceId" OtherKey="ResourceId" Type="Resource" IsForeignKey="true" /> 46 46 <Type Name="Slave" InheritanceCode="Slave" IsInheritanceDefault="true"> … … 95 95 <Column Name="Recurring" Type="System.Boolean" DbType="Bit" CanBeNull="false" /> 96 96 <Column Name="RecurringId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="false" /> 97 <Column Name="DowntimeType" Storage="_Type" Type="global::HeuristicLab.Services.Hive.DataAccess.DowntimeType" DbType="VarChar(MAX)" CanBeNull="false" /> 97 98 <Association Name="Resource_Downtime" Member="Resource" ThisKey="ResourceId" OtherKey="ResourceId" Type="Resource" IsForeignKey="true" DeleteRule="CASCADE" /> 98 99 </Type> … … 200 201 <Column Name="GrantedUserId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" CanBeNull="false" /> 201 202 <Column Name="GrantedByUserId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" CanBeNull="false" /> 202 <Association Name="Resource_SlavePermission" Member="Resource" ThisKey="ResourceId" OtherKey="ResourceId" Type="Resource" IsForeignKey="true" /> 203 <Association Name="Resource_ResourcePermission" Member="Resource" ThisKey="ResourceId" OtherKey="ResourceId" Type="Resource" IsForeignKey="true" /> 204 </Type> 205 </Table> 206 <Table Name="" Member="UserPriorities"> 207 <Type Name="UserPriority"> 208 <Column Name="UserId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" CanBeNull="false" /> 209 <Column Name="DateEnqueued" Type="System.DateTime" DbType="DateTime NOT NULL" CanBeNull="false" /> 203 210 </Type> 204 211 </Table>
Note: See TracChangeset
for help on using the changeset viewer.