Azure/azure-sdk-tools — pull request #2604 by shuainie (2014-05-23 21:44:43+00:00)
Title: Introducing ClusterType property for HDInsight cluster and update SDK nuget package version

This pull request fix the merge conflict of the earlier pull request