Merge pull request Azure#1293 from Azure/master

Merge master -> dev for HDInsight release

Author: markcowl

src/ResourceManager/HDInsight/AzureRM.HDInsight.psd1

@@ -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'  

src/ResourceManager/HDInsight/Commands.HDInsight/ManagementCommands/NewAzureHDInsightClusterCommand.cs

@@ -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;
@@ -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)
             {

src/ResourceManager/HDInsight/Commands.HDInsight/Models/Job/AzureHDInsightJob.cs

@@ -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;
@@ -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>
@@ -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; }
     }
 }

src/ResourceManager/HDInsight/Commands.HDInsight/Properties/AssemblyInfo.cs

@@ -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")]