[vz-dev] [volkszaehler/volkszaehler.org] 13aaeb: Add 15m grouping option to MySQLOptimizer

2015-04-21 Thread GitHub 
  Branch: refs/heads/master
  Home:   https://github.com/volkszaehler/volkszaehler.org
  Commit: 13aaeb982b35c0a46a1ebf2afdc4dc6831ac9c5d
  
https://github.com/volkszaehler/volkszaehler.org/commit/13aaeb982b35c0a46a1ebf2afdc4dc6831ac9c5d
  Author: andig 
  Date:   2015-04-19 (Sun, 19 Apr 2015)

  Changed paths:
M etc/volkszaehler.conf.template.php
M lib/Volkszaehler/Interpreter/SQL/MySQLOptimizer.php
M lib/Volkszaehler/Interpreter/SQL/SQLOptimizer.php

  Log Message:
  ---
  Add 15m grouping option to MySQLOptimizer


  Commit: 4f8bf897bd60cebd74feba023bf15f8062dce253
  
https://github.com/volkszaehler/volkszaehler.org/commit/4f8bf897bd60cebd74feba023bf15f8062dce253
  Author: andig 
  Date:   2015-04-21 (Tue, 21 Apr 2015)

  Changed paths:
M etc/volkszaehler.conf.template.php
M lib/Volkszaehler/Interpreter/SQL/MySQLOptimizer.php
M lib/Volkszaehler/Interpreter/SQL/SQLOptimizer.php

  Log Message:
  ---
  Merge pull request #294 from andig/demo-for-justin

Add 15m grouping option to MySQLOptimizer


Compare: 
https://github.com/volkszaehler/volkszaehler.org/compare/504213af4d80...4f8bf897bd60

[vz-dev] [volkszaehler/vzlogger] bc99e8: Remove master tree

2015-04-21 Thread GitHub 
  Branch: refs/heads/gh-pages
  Home:   https://github.com/volkszaehler/vzlogger
  Commit: bc99e8b82c609801c0e23335e40d23e4dbd3ab64
  
https://github.com/volkszaehler/vzlogger/commit/bc99e8b82c609801c0e23335e40d23e4dbd3ab64
  Author: andig 
  Date:   2015-04-21 (Tue, 21 Apr 2015)

  Changed paths:
R .editorconfig
R .gitignore
R .travis.yml
R AUTHORS
R CMakeLists.txt
R COPYING
R Dashboards/CTestConfigVZlogger.cmake
R Dashboards/KDECTestNightly.cmake
R Dashboards/Tools.cmake
R Dashboards/VZLoggerCoverage.cmake
R Dashboards/VZLoggerNightly.cmake
R Dashboards/run_nightly
R README.mysmartgrid
R config.hpp.in
R debian/changelog
R debian/compat
R debian/control
R debian/copyright
R debian/rules
R debian/source/format
R debian/vzlogger.init
R debian/vzlogger.manpages
R debian/vzlogger.postinst
R docs/vzlogger.1
R etc/vzlogger.conf
R etc/vzlogger_generic.schema.json
R etc/vzlogger_generic.schema.json.todo
R gmock/CMakeLists.txt
R gtest/CMakeLists.txt
R include/ApiIF.hpp
R include/Buffer.hpp
R include/Channel.hpp
R include/Config_Options.hpp
R include/CurlSessionProvider.hpp
R include/Json.hpp
R include/Meter.hpp
R include/MeterMap.hpp
R include/Obis.hpp
R include/Options.hpp
R include/Reading.hpp
R include/VZException.hpp
R include/api.h
R include/api/CurlCallback.hpp
R include/api/CurlIF.hpp
R include/api/CurlResponse.hpp
R include/api/MySmartGrid.hpp
R include/api/Null.hpp
R include/api/Volkszaehler.hpp
R include/common.h
R include/exception.h
R include/gitSha1.h
R include/list.h
R include/local.h
R include/meter_protocol.hpp
R include/protocols/MeterD0.hpp
R include/protocols/MeterExec.hpp
R include/protocols/MeterFile.hpp
R include/protocols/MeterFluksoV2.hpp
R include/protocols/MeterRandom.hpp
R include/protocols/MeterS0.hpp
R include/protocols/MeterSML.hpp
R include/protocols/Protocol.hpp
R include/shared_ptr.hpp
R include/threads.h
R include/unit.h
R include/vzlogger.h
R install.sh
R modules/CompilerFlags.cmake
R modules/ConfigureMacro.cmake
R modules/DebDependencies.cmake
R modules/FindCURL_WIN32.cmake
R modules/FindGnutls.cmake
R modules/FindJson.cmake
R modules/FindMicroHttpd.cmake
R modules/FindSML.cmake
R modules/GetGitRevisionDescription.cmake
R modules/GetGitRevisionDescription.cmake.in
R modules/OpenWRT.cmake
R modules/UseCodeCoverage.cmake
R schema.json
R src/Buffer.cpp
R src/CMakeLists.txt
R src/Channel.cpp
R src/Config_Options.cpp
R src/CurlSessionProvider.cpp
R src/Meter.cpp
R src/MeterMap.cpp
R src/Obis.cpp
R src/Options.cpp
R src/Reading.cpp
R src/api.cpp
R src/api/CMakeLists.txt
R src/api/CurlCallback.cpp
R src/api/CurlIF.cpp
R src/api/CurlResponse.cpp
R src/api/MySmartGrid.cpp
R src/api/Null.cpp
R src/api/Volkszaehler.cpp
R src/exception.cpp
R src/gitSha1.cpp.in
R src/local.cpp
R src/ltqnorm.cpp
R src/protocols/CMakeLists.txt
R src/protocols/MeterD0.cpp
R src/protocols/MeterExec.cpp
R src/protocols/MeterFile.cpp
R src/protocols/MeterFluksoV2.cpp
R src/protocols/MeterRandom.cpp
R src/protocols/MeterS0.cpp
R src/protocols/MeterSML.cpp
R src/test.cpp
R src/threads.cpp
R src/vzlogger.cpp
R tests/CMakeLists.txt
R tests/MeterD0.cpp
R tests/MeterSML.cpp
R tests/example_test.cpp
R tests/main.cpp
R tests/mocks/CMakeLists.txt
R tests/mocks/Channel.hpp
R tests/mocks/mock_metermap.cpp
R tests/ut_CurlSessionProvider.cpp
R tests/ut_MeterFile.cpp
R tests/ut_api_volkszaehler.cpp
R tests/ut_buffer.cpp
R tests/ut_meter.cpp
R tests/ut_obis.cpp

  Log Message:
  ---
  Remove master tree


  Commit: 0d2a6bc29895db2901f67aff043970c1bd0532b4
  
https://github.com/volkszaehler/vzlogger/commit/0d2a6bc29895db2901f67aff043970c1bd0532b4
  Author: andig 
  Date:   2015-04-21 (Tue, 21 Apr 2015)

  Changed paths:
R .editorconfig
R .gitignore
R .travis.yml
R AUTHORS
R CMakeLists.txt
R COPYING
R Dashboards/CTestConfigVZlogger.cmake
R Dashboards/KDECTestNightly.cmake
R Dashboards/Tools.cmake
R Dashboards/VZLoggerCoverage.cmake
R Dashboards/VZLoggerNightly.cmake
R Dashboards/run_nightly
R README.mysmartgrid
R config.hpp.in
R debian/changelog
R debian/compat
R debian/control
R debian/copyright
R debian/rules
R debian/source/format
R debian/vzlogger.init
R debian/vzlogger.manpages
R debian/vzlogger.postinst
R docs/vzlogger.1
R etc/vzlogger.conf
R etc/vzlogger_generic.schema.json
R etc/vzlogger_generic.schema.json.todo
R gmock/CMakeLists.txt
R gtest/CMakeLists.txt
R include/ApiIF.hpp
R include/