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

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/volkszaehler/vzlogger
  Commit: 84194f74bc8a5ab87a527d04442fb4e1d2af5dfb
      https://github.com/volkszaehler/vzlogger/commit/84194f74bc8a5ab87a527d04442fb4e1d2af5dfb
  Author: Daniel Lauckner <git at jahp.de>
  Date:   2017-02-26 (Sun, 26 Feb 2017)

  Changed paths:
    M .gitignore
    M install.sh

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


  Commit: 186243eeed091c6a1448a7c353e71d36d3a572af
      https://github.com/volkszaehler/vzlogger/commit/186243eeed091c6a1448a7c353e71d36d3a572af
  Author: Daniel Lauckner <git at jahp.de>
  Date:   2017-02-26 (Sun, 26 Feb 2017)

  Changed paths:
    M CMakeLists.txt
    R README
    A README.InfluxDB.md
    A README.md
    R README.mysmartgrid
    A README.mysmartgrid.md
    M etc/vzlogger.conf
    A etc/vzlogger.conf.InfluxDB
    M etc/vzlogger_generic.schema.json
    A include/api/InfluxDB.hpp
    M include/common.h
    M src/Channel.cpp
    M src/Config_Options.cpp
    M src/Meter.cpp
    M src/MeterMap.cpp
    M src/PushData.cpp
    M src/api.cpp
    M src/api/CMakeLists.txt
    A src/api/InfluxDB.cpp
    M src/api/MySmartGrid.cpp
    M src/api/Volkszaehler.cpp
    M src/protocols/MeterD0.cpp
    M src/protocols/MeterExec.cpp
    M src/protocols/MeterFile.cpp
    M src/protocols/MeterFluksoV2.cpp
    M src/protocols/MeterOCR.cpp
    M src/protocols/MeterOMS.cpp
    M src/protocols/MeterRandom.cpp
    M src/protocols/MeterS0.cpp
    M src/protocols/MeterSML.cpp
    M src/protocols/MeterW1therm.cpp
    M src/threads.cpp
    M src/vzlogger.cpp
    M tests/mocks/CMakeLists.txt

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


  Commit: ada06c7042305a8f5ed3d498b45f6d0c1ab80a83
      https://github.com/volkszaehler/vzlogger/commit/ada06c7042305a8f5ed3d498b45f6d0c1ab80a83
  Author: Daniel Lauckner <git at jahp.de>
  Date:   2017-02-26 (Sun, 26 Feb 2017)

  Changed paths:
    M install.sh

  Log Message:
  -----------
  install.sh systemd

installscript checks for systemd instead of inittab


  Commit: e11a02132d7be13ce82758530c7e75ac357662cc
      https://github.com/volkszaehler/vzlogger/commit/e11a02132d7be13ce82758530c7e75ac357662cc
  Author: Daniel Lauckner <git at jahp.de>
  Date:   2017-02-26 (Sun, 26 Feb 2017)

  Changed paths:
    M install.sh

  Log Message:
  -----------
  install.sh systemd

wiki URL


  Commit: 903c5a5fcc28f213457431859a153ee51d80ede3
      https://github.com/volkszaehler/vzlogger/commit/903c5a5fcc28f213457431859a153ee51d80ede3
  Author: Daniel Lauckner <git at jahp.de>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

  Changed paths:
    A etc/vzlogger.service
    M install.sh

  Log Message:
  -----------
  systemd unit

add systemd unit file after quote


  Commit: c7af2e6024c433aed5775f6b7622476503587570
      https://github.com/volkszaehler/vzlogger/commit/c7af2e6024c433aed5775f6b7622476503587570
  Author: Daniel Lauckner <git at jahp.de>
  Date:   2017-03-01 (Wed, 01 Mar 2017)

  Changed paths:
    M install.sh

  Log Message:
  -----------
  order changed


  Commit: 0caead19aacc12a2996a3e1669af87ffb52d118f
      https://github.com/volkszaehler/vzlogger/commit/0caead19aacc12a2996a3e1669af87ffb52d118f
  Author: J-A-U <J-A-U at users.noreply.github.com>
  Date:   2017-03-01 (Wed, 01 Mar 2017)

  Changed paths:
    A etc/vzlogger.service
    M install.sh

  Log Message:
  -----------
  Merge pull request #304 from J-A-U/systemd

Issue #303


Compare: https://github.com/volkszaehler/vzlogger/compare/126ab82ca02b...0caead19aacc