mirror of
https://github.com/status-im/consul.git
synced 2025-01-10 22:06:20 +00:00
Merge pull request #1559 from hashicorp/slackpad-patch-1
Fixes a bad merge in the UI.
This commit is contained in:
commit
0d81e4bab4
@ -92,8 +92,6 @@ App.DcRoute = App.BaseRoute.extend({
|
|||||||
|
|
||||||
// Return a promise hash to retreieve the
|
// Return a promise hash to retreieve the
|
||||||
// dcs and nodes used in the header
|
// dcs and nodes used in the header
|
||||||
var token = App.get('settings.token');
|
|
||||||
|
|
||||||
return Ember.RSVP.hash({
|
return Ember.RSVP.hash({
|
||||||
dc: params.dc,
|
dc: params.dc,
|
||||||
dcs: Ember.$.getJSON('/v1/catalog/datacenters'),
|
dcs: Ember.$.getJSON('/v1/catalog/datacenters'),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user