Merge remote-tracking branch 'refs/remotes/origin/master'

seanmcne · Dec 13, 2015 · 848b8b4 · 848b8b4
2 parents de11c38 + 7f31dbe
commit 848b8b4
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/Microsoft.Xrm.Data.PowerShell/Microsoft.Xrm.Data.PowerShell.psm1 b/Microsoft.Xrm.Data.PowerShell/Microsoft.Xrm.Data.PowerShell.psm1
@@ -2383,7 +2383,7 @@ function Get-CrmEntityAttributes{
 
     try
     {
-        $results = $conn.GetAllAttributesForEntity($EntityLogicalName)
+        $result = $conn.GetAllAttributesForEntity($EntityLogicalName)
 		if($result -eq $null)
         {
             return $conn.LastCrmException
@@ -2394,7 +2394,7 @@ function Get-CrmEntityAttributes{
         return $conn.LastCrmException
     }    
 
-    return $results
+    return $result
 }
 
 #GetAllEntityMetadata 
@@ -2490,7 +2490,7 @@ function Get-CrmEntityAllMetadata{
 
     try
     {
-        $results = $conn.GetAllEntityMetadata($OnlyPublished, $filter)
+        $result = $conn.GetAllEntityMetadata($OnlyPublished, $filter)
 		if($result -eq $null)
         {
             return $conn.LastCrmException
@@ -2501,7 +2501,7 @@ function Get-CrmEntityAllMetadata{
         return $conn.LastCrmException
     }    
 
-    return $results
+    return $result
 }
 
 #GetEntityAttributeMetadataForAttribute  
@@ -3038,7 +3038,7 @@ function Get-CrmEntityMetadata{
 
     try
     {
-        $results = $conn.GetEntityMetadata($EntityLogicalName, $filter)
+        $result = $conn.GetEntityMetadata($EntityLogicalName, $filter)
 		if($result -eq $null)
         {
             return $conn.LastCrmException
@@ -3049,7 +3049,7 @@ function Get-CrmEntityMetadata{
         return $conn.LastCrmException
     }    
 
-    return $results
+    return $result
 }
 
 #GetEntityName
@@ -3244,7 +3244,7 @@ function Get-CrmGlobalOptionSet{
 
     try
     {
-        $results = $conn.GetGlobalOptionSetMetadata($OptionSetName)
+        $result = $conn.GetGlobalOptionSetMetadata($OptionSetName)
 		if($result -eq $null)
         {
             return $conn.LastCrmException
@@ -3255,7 +3255,7 @@ function Get-CrmGlobalOptionSet{
         return $conn.LastCrmException
     }
 
-    return $results
+    return $result
 }
 
 #GetPickListElementFromMetadataEntity