[vz-dev] [volkszaehler/vzlogger] fecc84: Merge remote-tracking branch 'refs/remotes/volksza...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/volkszaehler/vzlogger
  Commit: fecc84600c6c8663fdcea13a70cb74b281e881da
      https://github.com/volkszaehler/vzlogger/commit/fecc84600c6c8663fdcea13a70cb74b281e881da
  Author: Daniel Lauckner <git at jahp.de>
  Date:   2017-11-01 (Wed, 01 Nov 2017)

  Changed paths:
    M etc/vzlogger_generic.schema.json
    M etc/vzlogger_generic.schema.json.todo
    M include/protocols/MeterSML.hpp
    M src/protocols/MeterSML.cpp

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/volkszaehler/master'


  Commit: 6b345a34e66d547a1fe6dc113f2f862cfb49b5ec
      https://github.com/volkszaehler/vzlogger/commit/6b345a34e66d547a1fe6dc113f2f862cfb49b5ec
  Author: Daniel Lauckner <git at jahp.de>
  Date:   2018-04-05 (Thu, 05 Apr 2018)

  Changed paths:
    M .travis.yml
    M README.md
    M config.hpp.in
    M include/Channel.hpp
    M include/protocols/MeterFile.hpp
    M modules/CompilerFlags.cmake
    M src/Meter.cpp
    M src/PushData.cpp
    M src/api/InfluxDB.cpp
    M src/api/MySmartGrid.cpp
    M src/protocols/MeterExec.cpp
    M src/protocols/MeterFile.cpp
    M src/protocols/MeterOMS.cpp
    M tests/ut_MeterFile.cpp

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/volkszaehler/master'


  Commit: 5d5477912bd68394268403c8243901f94bdbbb76
      https://github.com/volkszaehler/vzlogger/commit/5d5477912bd68394268403c8243901f94bdbbb76
  Author: Daniel Lauckner <git at jahp.de>
  Date:   2018-04-05 (Thu, 05 Apr 2018)

  Changed paths:
    M etc/vzlogger_generic.schema.json

  Log Message:
  -----------
  E.g. Impulse

Example for identifier enhanced


  Commit: 8267c99385425ed25202d5b349681520ed1ca5e4
      https://github.com/volkszaehler/vzlogger/commit/8267c99385425ed25202d5b349681520ed1ca5e4
  Author: J-A-U <J-A-U at users.noreply.github.com>
  Date:   2018-04-05 (Thu, 05 Apr 2018)

  Changed paths:
    M etc/vzlogger_generic.schema.json

  Log Message:
  -----------
  Merge pull request #12 from J-A-U/conf_editor

E.g. Impulse


  Commit: 0bc97c6c9155a4b9aacc9dacac33c934f71e1c2f
      https://github.com/volkszaehler/vzlogger/commit/0bc97c6c9155a4b9aacc9dacac33c934f71e1c2f
  Author: J-A-U <J-A-U at users.noreply.github.com>
  Date:   2018-04-05 (Thu, 05 Apr 2018)

  Changed paths:
    M etc/vzlogger_generic.schema.json

  Log Message:
  -----------
  Merge pull request #353 from J-A-U/master

E.g. Impulse


Compare: https://github.com/volkszaehler/vzlogger/compare/d15db6d69fb9...0bc97c6c9155