Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V9.9.6 Stable merge #1159

Merged
merged 179 commits into from
Feb 12, 2019
Merged

V9.9.6 Stable merge #1159

merged 179 commits into from
Feb 12, 2019

Conversation

glynhudson
Copy link
Member

@glynhudson glynhudson commented Jan 16, 2019

Thankyou to everyone who contributed, including:

adminde and others added 30 commits July 31, 2018 20:47
# Conflicts:
#	Lib/responsive-linked-tables.js
#	Modules/feed/Views/feedlist_view_v2.php
#	Modules/input/Views/device_view.php
# Conflicts:
#	Modules/feed/Views/feedlist_view_v2.php
#	Modules/input/Views/device_view.php
Prefixes for keys are handy, but redis supports multiple separate dbs entirely,
via "select".  Expose that as a configuration setting.

Signed-off-by: Karl Palsson <karlp@tweak.net.au>
# Conflicts:
#	Modules/feed/Views/feedlist_view_v2.php
Quick fix to remove colons from topic.  Suggest it is expanded to include all characters inputs should not use.
@@ -33,15 +33,15 @@
###

[Unit]
Description=Emoncms mqtt_input script
Description=Emoncms emoncms_mqtt script
Wants=mosquitto.service mysql.service redis.service
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be redis-server.service

TrystanLea and others added 4 commits February 7, 2019 11:18
Tidy feedwriter, service-runner and mqtt_input services
Resolve issue whereby the different default redis prefix used in emonpi and default settings mean that service runner was unable to get the right item off the queue.

this is only a temporary fix
@alexandrecuer
Copy link
Contributor

Just trying to create virtual feeds with that PR 1159

It appears not to be possible....

just after adding the source feed, when i want to save, I got the following message box : "ERROR: Could not save processlist. Cannot use virtual feed as source" but I did not choose a virtual feed as a source

when I checkout to a older version, I have no problem

Did anybody face a similar problem ?

Alex
virtual_feeds_save_error

@TrystanLea TrystanLea merged commit 22d2e6c into stable Feb 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.