Add standard .gitattributes file, to avoid line ending problems.
- Add a standard .gitattributes file, generated by the GitHub client app for Windows. - Fix some wonky line endings which Visual Studio detected in ConfigurationServices.cs
This commit is contained in:
Родитель
c36741f067
Коммит
a617871144
|
@ -0,0 +1,17 @@
|
|||
# Auto detect text files and perform LF normalization
|
||||
* text=auto
|
||||
|
||||
# Custom for Visual Studio
|
||||
*.cs diff=csharp
|
||||
|
||||
# Standard to msysgit
|
||||
*.doc diff=astextplain
|
||||
*.DOC diff=astextplain
|
||||
*.docx diff=astextplain
|
||||
*.DOCX diff=astextplain
|
||||
*.dot diff=astextplain
|
||||
*.DOT diff=astextplain
|
||||
*.pdf diff=astextplain
|
||||
*.PDF diff=astextplain
|
||||
*.rtf diff=astextplain
|
||||
*.RTF diff=astextplain
|
|
@ -19,7 +19,7 @@ namespace Microsoft.Spark.CSharp.Configuration
|
|||
/// to be used in SparkCLR runtime
|
||||
/// </summary>
|
||||
internal class ConfigurationService : IConfigurationService
|
||||
{
|
||||
{
|
||||
private ILoggerService logger = LoggerServiceFactory.GetLogger(typeof(ConfigurationService));
|
||||
private SparkCLRConfiguration configuration;
|
||||
private RunMode runMode = RunMode.UNKNOWN; //not used anywhere for now but may come handy in the future
|
||||
|
@ -51,8 +51,8 @@ namespace Microsoft.Spark.CSharp.Configuration
|
|||
configuration = new SparkCLRConfiguration(appConfig);
|
||||
runMode = RunMode.CLUSTER;
|
||||
}
|
||||
else if (sparkMaster.StartsWith("yarn"))
|
||||
{
|
||||
else if (sparkMaster.StartsWith("yarn"))
|
||||
{
|
||||
runMode = RunMode.YARN;
|
||||
throw new NotSupportedException("YARN is not currently supported");
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче