Merge branch 'v2.0'

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

diff --git a/skyquake/plugins/accounts/src/account/accountsDashboard.jsx b/skyquake/plugins/accounts/src/account/accountsDashboard.jsx
index f139b47..7b56011 100644 (file)
--- a/skyquake/plugins/accounts/src/account/accountsDashboard.jsx
+++ b/skyquake/plugins/accounts/src/account/accountsDashboard.jsx
@@ -26,7 +26,7 @@ import 'style/layout.scss';
 class AccountsDashboard extends React.Component {
     constructor(props) {
         super(props);
-        this.Store = this.props.flux.stores.hasOwnProperty('AccountStore') ? this.props.flux.stores.AccountStore : this.props.flux.createStore(AccountStore);
+        this.Store = this.props.flux.stores.hasOwnProperty('AccountStore') ? this.props.flux.stores.AccountStore : this.props.flux.createStore(AccountStore, "AccountStore");
         this.state = this.Store.getState();
     }
     componentWillMount() {

diff --git a/skyquake/plugins/config/src/dashboard/dashboard.jsx b/skyquake/plugins/config/src/dashboard/dashboard.jsx
index 99bff06..7430994 100644 (file)
--- a/skyquake/plugins/config/src/dashboard/dashboard.jsx
+++ b/skyquake/plugins/config/src/dashboard/dashboard.jsx
@@ -15,7 +15,7 @@ import Button from 'widgets/button/rw.button.js';
 class ConfigDashboard extends React.Component {
     constructor(props) {
         super(props);
-        this.Store = this.props.flux.stores.hasOwnProperty('ConfigStore') ? this.props.flux.stores.ConfigStore : this.props.flux.createStore(ConfigStore);
+        this.Store = this.props.flux.stores.hasOwnProperty('ConfigStore') ? this.props.flux.stores.ConfigStore : this.props.flux.createStore(ConfigStore, "ConfigStore");
         this.state = this.Store.getState();
     }
     componentWillMount() {