Merge lp:~blake-rouse/maas/fix-1483273-1.8 into lp:maas/1.8

[Blake Rouse]

Use cluster_name instead of name for the cluster that appears over the websocket.

Backport: https://code.launchpad.net/~blake-rouse/maas/fix-1483273/+merge/272468

[Blake Rouse (blake-rouse)]

Self-approving backport.

review: Approve

=== modified file 'src/maasserver/static/partials/node-details.html'
--- src/maasserver/static/partials/node-details.html	2015-07-20 10:38:15 +0000
+++ src/maasserver/static/partials/node-details.html	2015-09-25 21:25:41 +0000
@@ -116,7 +116,7 @@
                                 <select name="cluster" id="cluster" placeholder="Choose a cluster"
                                     data-ng-disabled="!summary.editing"
                                     data-ng-model="summary.cluster.selected"
-                                    data-ng-options="cluster as cluster.name for cluster in summary.cluster.options">
+                                    data-ng-options="cluster as cluster.cluster_name for cluster in summary.cluster.options">
                                     <option value="" disabled="disabled">Choose a cluster</option>
                                 </select>
                             </div>