Context Navigation

← Previous Change
Next Change →

HeuristicLab.Services.Hive.DataAccess

Timestamp:

05/27/13 12:44:27 (11 years ago)

Author:

ascheibe

Message:

#2030 merged changes of trunk into branch

Location:

branches/HivePerformance/sources

Files:

: 18 edited

. (modified) (1 prop)
HeuristicLab.Services.Hive.DataAccess (modified) (1 prop)
HeuristicLab.Services.Hive.DataAccess/3.3/Convert.cs (modified) (1 diff)
HeuristicLab.Services.Hive.DataAccess/3.3/Enums/Command.cs (modified) (1 diff)
HeuristicLab.Services.Hive.DataAccess/3.3/Enums/CpuArchitecture.cs (modified) (1 diff)
HeuristicLab.Services.Hive.DataAccess/3.3/Enums/DowntimeType.cs (modified) (1 diff)
HeuristicLab.Services.Hive.DataAccess/3.3/Enums/Permission.cs (modified) (1 diff)
HeuristicLab.Services.Hive.DataAccess/3.3/Enums/SlaveState.cs (modified) (1 diff)
HeuristicLab.Services.Hive.DataAccess/3.3/Enums/TaskState.cs (modified) (1 diff)
HeuristicLab.Services.Hive.DataAccess/3.3/Exceptions/DaoException.cs (modified) (1 diff)
HeuristicLab.Services.Hive.DataAccess/3.3/HiveDao.cs (modified) (1 diff)
HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.cs (modified) (1 diff)
HeuristicLab.Services.Hive.DataAccess/3.3/ITransactionManager.cs (modified) (1 diff)
HeuristicLab.Services.Hive.DataAccess/3.3/Interfaces/IHiveDao.cs (modified) (1 diff)
HeuristicLab.Services.Hive.DataAccess/3.3/Logger.cs (modified) (1 diff)
HeuristicLab.Services.Hive.DataAccess/3.3/Plugin.cs.frame (modified) (2 diffs)
HeuristicLab.Services.Hive.DataAccess/3.3/Properties/AssemblyInfo.cs.frame (modified) (3 diffs)
HeuristicLab.Services.Hive.DataAccess/3.3/TransactionManager.cs (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/HivePerformance/sources
- Property svn:mergeinfo changed
  /trunk/sources merged: 9445,9447-9459,9462-9466,9471-9472,9474,9476-9479,9493,9496,9498,9504-9506,9515-9517,9520-9521,9523,9530-9531,9534-9537
branches/HivePerformance/sources/HeuristicLab.Services.Hive.DataAccess
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Services.Hive.DataAccess merged: 9456,9462

branches/HivePerformance/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Convert.cs

r6983	r9539
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HivePerformance/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Enums/Command.cs

r7259	r9539
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HivePerformance/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Enums/CpuArchitecture.cs

r7259	r9539
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HivePerformance/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Enums/DowntimeType.cs

r8957	r9539
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HivePerformance/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Enums/Permission.cs

r7259	r9539
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HivePerformance/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Enums/SlaveState.cs

r7259	r9539
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HivePerformance/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Enums/TaskState.cs

r7259	r9539
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HivePerformance/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Exceptions/DaoException.cs

r6983	r9539
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HivePerformance/sources/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDao.cs

r6983	r9539
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HivePerformance/sources/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.cs

r8924	r9539
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HivePerformance/sources/HeuristicLab.Services.Hive.DataAccess/3.3/ITransactionManager.cs

r9266	r9539
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HivePerformance/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Interfaces/IHiveDao.cs

r6983	r9539
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HivePerformance/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Logger.cs

r7259	r9539
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HivePerformance/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Plugin.cs.frame

-                      r8246
+                      r9539
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 namespace HeuristicLab.Services.Hive.DataAccess {
   [Plugin("HeuristicLab.Services.Hive.DataAccess", "3.3.7.$WCREV$")]
+  [Plugin("HeuristicLab.Services.Hive.DataAccess", "3.3.8.$WCREV$")]
   [PluginFile("HeuristicLab.Services.Hive.DataAccess-3.3.dll", PluginFileType.Assembly)]
   public class HeuristicLabServicesHiveDataAccessPlugin : PluginBase {

branches/HivePerformance/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Properties/AssemblyInfo.cs.frame

-                      r8246
+                      r9539
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
 [assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2013 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 …
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
 [assembly: AssemblyFileVersion("3.3.7.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.8.$WCREV$")]

branches/HivePerformance/sources/HeuristicLab.Services.Hive.DataAccess/3.3/TransactionManager.cs

r9369	r9539
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

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

Context Navigation

Changeset 9539 for branches/HivePerformance/sources/HeuristicLab.Services.Hive.DataAccess

Legend:

Download in other formats: