Merge branch 'release-3.8'

2017-04-17 15:08:56 -04:00
--- a/webapp/components/admin_console/admin_sidebar.jsx
+++ b/webapp/components/admin_console/admin_sidebar.jsx
@@ -96,7 +96,7 @@ export default class AdminSidebar extends React.Component {
                        title={
                            <FormattedMessage
                                id='admin.sidebar.cluster'
-                                defaultMessage='High Availability (Beta)'
+                                defaultMessage='High Availability'
                            />
                        }
                    />
--- a/webapp/components/admin_console/cluster_settings.jsx
+++ b/webapp/components/admin_console/cluster_settings.jsx
@@ -53,7 +53,7 @@ export default class ClusterSettings extends AdminSettings {
        return (
            <FormattedMessage
                id='admin.advance.cluster'
-                defaultMessage='High Availability (Beta)'
+                defaultMessage='High Availability'
            />
        );
    }