Repository: reef Updated Branches: refs/heads/master 9edfd33d1 -> ceacf2032
[REEF-724] Remove ClrBridgeRuntimeConfiguration from Constants.cs JIRA: [REEF-724](https://issues.apache.org/jira/browse/REEF-724) Pull request: This closes #762 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/ceacf203 Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/ceacf203 Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/ceacf203 Branch: refs/heads/master Commit: ceacf2032ddfeac7169308f11cfdfd3c2cd5dffd Parents: 9edfd33 Author: Mariia Mykhailova <[email protected]> Authored: Mon Jan 11 17:38:50 2016 -0800 Committer: Dongjoon Hyun <[email protected]> Committed: Tue Jan 12 11:45:29 2016 -0800 ---------------------------------------------------------------------- .../Common/DriverFolderPreparationHelper.cs | 4 ++-- lang/cs/Org.Apache.REEF.Common/Constants.cs | 3 --- lang/cs/Org.Apache.REEF.Driver/Constants.cs | 3 --- 3 files changed, 2 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/ceacf203/lang/cs/Org.Apache.REEF.Client/Common/DriverFolderPreparationHelper.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client/Common/DriverFolderPreparationHelper.cs b/lang/cs/Org.Apache.REEF.Client/Common/DriverFolderPreparationHelper.cs index 1ddae18..827960c 100644 --- a/lang/cs/Org.Apache.REEF.Client/Common/DriverFolderPreparationHelper.cs +++ b/lang/cs/Org.Apache.REEF.Client/Common/DriverFolderPreparationHelper.cs @@ -120,9 +120,9 @@ namespace Org.Apache.REEF.Client.Common _configurationSerializer.ToFile(driverConfiguration, Path.Combine(driverFolderPath, _fileNames.GetClrDriverConfigurationPath())); - // TODO: Remove once we cleaned up the Evaluator to not expect this [REEF-216] + // TODO: Remove once we cleaned up the Evaluator to not expect this [REEF-217] _configurationSerializer.ToFile(driverConfiguration, - Path.Combine(driverFolderPath, _fileNames.GetGlobalFolderPath(), Constants.ClrBridgeRuntimeConfiguration)); + Path.Combine(driverFolderPath, _fileNames.GetGlobalFolderPath(), _fileNames.GetClrBridgeConfigurationName())); } /// <summary> http://git-wip-us.apache.org/repos/asf/reef/blob/ceacf203/lang/cs/Org.Apache.REEF.Common/Constants.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Constants.cs b/lang/cs/Org.Apache.REEF.Common/Constants.cs index a19fd7d..c2731b8 100644 --- a/lang/cs/Org.Apache.REEF.Common/Constants.cs +++ b/lang/cs/Org.Apache.REEF.Common/Constants.cs @@ -23,9 +23,6 @@ namespace Org.Apache.REEF.Common { public class Constants { - [Obsolete(message: "Use REEFFileNames instead.")] - public const string ClrBridgeRuntimeConfiguration = "clrBridge.config"; - // if 8080 port is not used, then query would fail, // this is only for local runtime testing purpose though, so it should be ok public const string LocalHttpEndpointBaseUri = @"http://localhost:8080/";; http://git-wip-us.apache.org/repos/asf/reef/blob/ceacf203/lang/cs/Org.Apache.REEF.Driver/Constants.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Constants.cs b/lang/cs/Org.Apache.REEF.Driver/Constants.cs index 7f787b6..f18c381 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Constants.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Constants.cs @@ -50,9 +50,6 @@ namespace Org.Apache.REEF.Driver /// </summary> public const int DefaultMemoryGranularity = 1024; - [Obsolete(message: "Use REEFFileNames instead.")] - public const string DriverBridgeConfiguration = Common.Constants.ClrBridgeRuntimeConfiguration; - /// <summary> /// The directory to load driver DLLs. /// </summary>
