From: Laurence Maultsby <laurence.maultsby@riftio.com>
Date: Fri, 5 May 2017 18:10:52 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/v2.0'
X-Git-Tag: v3.0.0rc~21
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=commitdiff_plain;h=bebb52c6b68786a18d2003c88b69e02b6a109172;hp=ae7bbd19c580eae550ac91d549e35c1e34289503

Merge remote-tracking branch 'origin/v2.0'

Signed-off-by: Laurence Maultsby <laurence.maultsby@riftio.com>
---

diff --git a/skyquake/plugins/accounts/src/account/accountStore.js b/skyquake/plugins/accounts/src/account/accountStore.js
index aeb5f4817..def033a8a 100644
--- a/skyquake/plugins/accounts/src/account/accountStore.js
+++ b/skyquake/plugins/accounts/src/account/accountStore.js
@@ -122,7 +122,7 @@ let AccountMeta = {
                 label: 'Management Network',
                 ref: 'mgmt-network'
             }, {
-                label: 'Floating IP Pool',
+                label: 'Floating IP Pool Network Name',
                 ref: 'floating-ip-pool',
                 optional: true
             }, {