Skip to content

Merge master -> dev for HDInsight release #1293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 14, 2015
Merged

Merge master -> dev for HDInsight release #1293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c2d9ee
bug fixes
Nov 11, 2015
bcc2cad
updating versions
Nov 12, 2015
b998b24
Merge pull request #1281 from shefaliv/hdi
markcowl Nov 12, 2015
81b36fa
Merge pull request #1290 from Azure/HDInsight102
markcowl Nov 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ResourceManager/HDInsight/AzureRM.HDInsight.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@{

# Version number of this module.
ModuleVersion = '1.0.1'
ModuleVersion = '1.0.2'

# ID used to uniquely identify this module
GUID = '3fd1475f-cb23-4ffb-bf08-33d94b7d1acb'
Expand Down
4 changes: 2 additions & 2 deletions ...anager/HDInsight/Commands.HDInsight/ManagementCommands/NewAzureHDInsightClusterCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ var storageAccount in
parameters.HeadNodeSize = value.HeadNodeSize;
parameters.ZookeeperNodeSize = value.ZookeeperNodeSize;
HiveMetastore = value.HiveMetastore;
OozieMetastore = value.HiveMetastore;
OozieMetastore = value.OozieMetastore;
CertificateFilePath = value.CertificateFilePath;
AadTenantId = value.AADTenantId;
ObjectId = value.ObjectId;
Expand Down Expand Up @@ -332,7 +332,7 @@ var storageAccount in
if (HiveMetastore != null)
{
var metastore = HiveMetastore;
parameters.OozieMetastore = new Metastore(metastore.SqlAzureServerName, metastore.DatabaseName, metastore.Credential.UserName, metastore.Credential.Password.ConvertToString());
parameters.HiveMetastore = new Metastore(metastore.SqlAzureServerName, metastore.DatabaseName, metastore.Credential.UserName, metastore.Credential.Password.ConvertToString());
}
if (CertificateFilePath != null && CertificatePassword != null)
{
Expand Down
8 changes: 7 additions & 1 deletion src/ResourceManager/HDInsight/Commands.HDInsight/Models/Job/AzureHDInsightJob.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class AzureHDInsightJob
/// <param name="cluster">The cluster that the jobDetails was created against.</param>
public AzureHDInsightJob(JobDetailRootJsonObject jobDetails, string cluster)
{
Cluster = cluster.Substring(0, cluster.IndexOf('.') + 1);
Cluster = cluster.Substring(0, cluster.IndexOf('.'));
HttpEndpoint = cluster;
State = jobDetails.Status.State;
JobId = jobDetails.Id;
Expand All @@ -38,6 +38,7 @@ public AzureHDInsightJob(JobDetailRootJsonObject jobDetails, string cluster)
User = jobDetails.User;
Callback = jobDetails.Callback;
Completed = jobDetails.Completed;
StatusFolder = jobDetails.Userargs.Statusdir.ToString();
}

/// <summary>
Expand Down Expand Up @@ -89,5 +90,10 @@ public AzureHDInsightJob(JobDetailRootJsonObject jobDetails, string cluster)
/// Gets a string representing completed status, for example "done".
/// </summary>
public string Completed { get; set; }

/// <summary>
/// Gets the status folder for the jobDetails.
/// </summary>
public string StatusFolder { get; set; }
}
}
4 changes: 2 additions & 2 deletions src/ResourceManager/HDInsight/Commands.HDInsight/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@
[assembly: ComVisible(false)]
[assembly: CLSCompliant(false)]
[assembly: Guid("57ad7b0e-1f56-4166-b1f9-ec6512139a54")]
[assembly: AssemblyVersion(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyVersion)]
[assembly: AssemblyFileVersion(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyFileVersion)]
[assembly: AssemblyVersion("1.0.2")]
[assembly: AssemblyFileVersion("1.0.2")]