From b26663afa694d7414cf280eea62d6cde8f515106 Mon Sep 17 00:00:00 2001
From: Vincent Fiduccia <vincent@rancher.com>
Date: Thu, 20 Oct 2016 12:45:46 -0700
Subject: [PATCH 1/2] Default IPSec ports open for Azure

---
 app/components/machine/driver-azure/component.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/components/machine/driver-azure/component.js b/app/components/machine/driver-azure/component.js
index 9090e0b6f..b4973426d 100644
--- a/app/components/machine/driver-azure/component.js
+++ b/app/components/machine/driver-azure/component.js
@@ -32,8 +32,7 @@ export default Ember.Component.extend(Driver, {
       subscriptionId   : '',
       clientId         : '',
       clientSecret     : '',
-      openPorts        : '',
-//      openPorts        : '500/udp,4500/udp',
+      openPort         : ['500/udp','4500/udp'],
     });
 
     this.set('model', this.get('store').createRecord({

From 4cbeb4c895481223b6f23a5cb24e51d66deb35c7 Mon Sep 17 00:00:00 2001
From: Vincent Fiduccia <vincent@rancher.com>
Date: Fri, 21 Oct 2016 15:28:08 -0700
Subject: [PATCH 2/2] bugs

---
 app/components/form-engine-opts/component.js |  1 +
 app/components/stack-section/template.hbs    | 90 ++++++++++----------
 app/components/upgrade-btn/template.hbs      |  4 +-
 3 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/app/components/form-engine-opts/component.js b/app/components/form-engine-opts/component.js
index 0d6c795b5..0e53570f4 100644
--- a/app/components/form-engine-opts/component.js
+++ b/app/components/form-engine-opts/component.js
@@ -20,6 +20,7 @@ export default Ember.Component.extend({
       {label: this.get('intl').t('formEngineOpts.engineInstallUrl.recommended'), value: def},
       {label: 'v1.10.x', value: 'https://releases.rancher.com/install-docker/1.10.sh'},
       {label: 'v1.11.x', value: 'https://releases.rancher.com/install-docker/1.11.sh'},
+      {label: 'v1.12.x', value: 'https://releases.rancher.com/install-docker/1.12.sh'},
       {label: this.get('intl').t('formEngineOpts.engineInstallUrl.latest'), value: 'https://get.docker.com'},
     ];
 
diff --git a/app/components/stack-section/template.hbs b/app/components/stack-section/template.hbs
index 42a3c946c..2517fe28d 100644
--- a/app/components/stack-section/template.hbs
+++ b/app/components/stack-section/template.hbs
@@ -80,49 +80,51 @@
         </div>
       {{/if}}
     {{/if}}
-    {{#if model.services.length}}
-      <table class="grid fixed sized" style="margin-bottom: 0">
-        <tbody>
-          {{#each sortedServices as |service|}}
-            <tr>
-              <td data-title="{{t 'stackSection.table.dataTitle.state'}}:" class="state">
-                {{badge-state model=service}}
-              </td>
-              <td data-title="{{t 'stackSection.table.dataTitle.serviceName'}}:" class="force-wrap">
-                {{#link-to "service" service.stackId service.id}}{{service.displayName}}{{/link-to}}
-                {{#if service.hasSidekicks}}
-                  {{t 'stackSection.sidekick' numSidekicks=service.secondaryLaunchConfigs.length}}
-                {{/if}}
-                {{#if service.showTransitioningMessage}}
-                  <span class="{{service.stateColor}}">({{service.transitioningMessage}})</span>
-                {{/if}}
-                <button type="button" class="btn-link" role="button" {{action 'addtlInfo' service}}>
-                  <i class="icon icon-info addtl-info-trigger"/>
-                </button>
-                {{#if service.isError}}
-                  {{#link-to "service.log" service.stackId service.id class="btn-link"}}<i class="icon icon-alert"/>{{/link-to}}
-                {{/if}}
-              </td>
-              <td data-title="{{t 'stackSection.table.dataTitle.details'}}:" class="force-wrap service-detail">{{service.displayDetail}}{{service.displayPorts}}</td>
-              <td data-title="{{t 'stackSection.table.dataTitle.kind'}}:">
-                {{#if service.displayType}}
-                  {{service.displayType}}
-                {{/if}}
-              </td>
-              <td data-title="{{t 'stackSection.table.dataTitle.containers'}}:">
-                {{#if service.hasContainers}}
-                  {{default-str service.instances.length default="0"}} {{t 'stackSection.container' numContainers=service.instances.length}}
-                {{/if}}
-              </td>
-              <td data-title="{{t 'stackSection.table.dataTitle.actions'}}:" class="actions wide">
-                {{action-menu model=service}}
-              </td>
-            </tr>
-          {{/each}}
-        </tbody>
-      </table>
-    {{else}}
-      <div class="text-muted text-center r-p10">{{t 'stackSection.none'}}</div>
-    {{/if}}
+    <table class="grid fixed sized" style="margin-bottom: 0">
+      <tbody>
+        {{#each sortedServices as |service|}}
+          <tr>
+            <td data-title="{{t 'stackSection.table.dataTitle.state'}}:" class="state">
+              {{badge-state model=service}}
+            </td>
+            <td data-title="{{t 'stackSection.table.dataTitle.serviceName'}}:" class="force-wrap">
+              {{#link-to "service" service.stackId service.id}}{{service.displayName}}{{/link-to}}
+              {{#if service.hasSidekicks}}
+                {{t 'stackSection.sidekick' numSidekicks=service.secondaryLaunchConfigs.length}}
+              {{/if}}
+              {{#if service.showTransitioningMessage}}
+                <span class="{{service.stateColor}}">({{service.transitioningMessage}})</span>
+              {{/if}}
+              <button type="button" class="btn-link" role="button" {{action 'addtlInfo' service}}>
+                <i class="icon icon-info addtl-info-trigger"/>
+              </button>
+              {{#if service.isError}}
+                {{#link-to "service.log" service.stackId service.id class="btn-link"}}<i class="icon icon-alert"/>{{/link-to}}
+              {{/if}}
+            </td>
+            <td data-title="{{t 'stackSection.table.dataTitle.details'}}:" class="force-wrap service-detail">{{service.displayDetail}}{{service.displayPorts}}</td>
+            <td data-title="{{t 'stackSection.table.dataTitle.kind'}}:">
+              {{#if service.displayType}}
+                {{service.displayType}}
+              {{/if}}
+            </td>
+            <td data-title="{{t 'stackSection.table.dataTitle.containers'}}:">
+              {{#if service.hasContainers}}
+                {{default-str service.instances.length default="0"}} {{t 'stackSection.container' numContainers=service.instances.length}}
+              {{/if}}
+            </td>
+            <td data-title="{{t 'stackSection.table.dataTitle.actions'}}:" class="actions wide">
+              {{action-menu model=service}}
+            </td>
+          </tr>
+        {{else}}
+          <tr>
+            <td colspan="6" class="text-muted text-center r-p10">
+              {{t 'stackSection.none'}}
+            </td>
+          </tr>
+        {{/each}}
+      </tbody>
+    </table>
   </div>
 {{/liquid-if}}
diff --git a/app/components/upgrade-btn/template.hbs b/app/components/upgrade-btn/template.hbs
index c3d1b6df2..7d6fd9a51 100644
--- a/app/components/upgrade-btn/template.hbs
+++ b/app/components/upgrade-btn/template.hbs
@@ -1,3 +1 @@
-{{#tooltip-element type="tooltip-basic" model=currentVersion tooltipTemplate='tooltip-static' aria-describedby="tooltip-base"}}
-  {{t (concat-str 'upgradeBtn.status.' upgradeStatus character='')}}
-{{/tooltip-element}}
+{{t (concat-str 'upgradeBtn.status.' upgradeStatus character='')}}