Clip:aa0af88c86c0b1b918751536f3a37079336e6e20 commits - 南方科技大学 https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commits/aa0af88c86c0b1b918751536f3a37079336e6e20 2015-02-07T22:45:47+00:00 https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/aa0af88c86c0b1b918751536f3a37079336e6e20 new metric explorer 2015-02-07T22:45:47+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/6b4961998af0beced9f00edf73c60c52544abbfd Merge branch 'crate_backend' into dev 2015-02-07T22:34:10+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/1c34ee3bb0d8cc93127e7a161709f56260a51b00 merge lauras metric explorer from upstream 2015-02-07T22:31:52+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/0284ef0956be3cb5ea2fead73348c4eee67a1429 upstream libfnord changes 2015-02-07T22:25:47+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/69ae93f69149749889b315449d6697d3454e695a merge upstream changes from libfnord 2015-02-01T18:53:45+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/81cbc362c6f9e43fab132c304f579ecc76240d69 fix makefile 2015-02-01T14:35:46+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/ed365a61c93a06933f67dc478490400f9cdaf11c better asset.sh 2015-02-01T14:31:51+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/44fa2e6fb911fefa6af6092df86a4bc102930193 fix merge conflict 2015-02-01T02:30:36+00:00 Laura Schlimmer laura@etat-gray.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/73ffb33f74dc2fcf6fab37ba08431938649764ea doc/web/assets/favicon.ico 2015-02-01T02:14:08+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/9a357d0ad09ffa7fc1728e41421c39968971897a authors 2015-02-01T02:08:05+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/4e258fb5ec738440e2796a4360b04a4556cb5487 Merge branch 'dev' of paulasmuth.com:paulbox/fnordmetric into dev 2015-02-01T02:05:06+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/464934d6c3e8e9b83f1a6faf454424b1a02efc9e Merge remote-tracking branch 'andoriyu/patch-1' 2015-02-01T02:03:55+00:00 Paul Asmuth paul@paulasmuth.com Conflicts: src/libfnord/fnord-json/jsonargumentlist.h https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/cc8651fc224779b320e46a3ffc30f303e4c001be Merge remote-tracking branch 'simplepi/master' 2015-02-01T02:01:30+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/e310d84feac8bb1781079ea9bd2dc9553adcbfab merge crate backend WIP 2015-02-01T02:00:37+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/2e89f300fe35802d4de89601d9f377a9ecc3268e Merge remote-tracking branch 'bogensberger/master' into crate_backend 2015-02-01T01:13:14+00:00 Paul Asmuth paul@paulasmuth.com Conflicts: fnordmetric-core/build/cmake/CMakeLists.txt fnordmetric-core/src/metricdb/httpapi.cc fnordmetric-core/src/server.cc https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/88b62145b31fbef34860e8318a6c429c994b6ed6 cleaning up 2015-02-01T01:03:27+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/ebe2652b08bdacc346dfe70437b48bae84e9850e delete travis.yml 2015-02-01T01:01:28+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/a4ece010aa7f46fbb92f61203db409a85436d695 make devserver fix 2015-02-01T00:58:02+00:00 Laura Schlimmer laura@etat-gray.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/1239a183547177e21a12544c74d46c06327feccb ... 2015-02-01T00:45:35+00:00 Laura Schlimmer laura@etat-gray.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/cf79e996fe427891c73c4d788effd10200048fc3 webcomponents update 2015-02-01T00:43:59+00:00 Laura Schlimmer laura@etat-gray.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/61bb6c71f7df33f1120cf8f94bf6fe7c9c993ad3 cmake fix 2015-02-01T00:40:28+00:00 Laura Schlimmer laura@etat-gray.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/903602f3ab29e83f688ef7e2e12d96491ae8154a fontawesome fix 2015-02-01T00:36:15+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/b02467f53e8b01fb445924f486bf3b6b33332777 adminui assets 2015-02-01T00:30:45+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/05328cef58319a2e3b012279de1254e43f1f7995 fix asset reg. 2015-02-01T00:21:18+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/ccd605d33ac4221b054f8b0db8c98ce336c831fb build assets w/ cmake 2015-02-01T00:10:29+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/cadddd49e05beecb13ba410468cdab15a18a6ab5 format.{cc,h} 2015-01-31T23:54:30+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/ba370c0fe05a087bc814e6c584d0f6b3ca982c61 src/{fnordmetric, libfnord} 2015-01-31T23:52:45+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/eb0eec17efaf0b66e25b17405e7aca3f351e6e0a adminui WIP 2015-01-31T23:37:31+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/49dba6b89c3948d5b3abbd2a2520c665c5f2af33 TODO 2015-01-31T23:15:32+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/a2259fc1c6b857a8d410fa9e3d99abbcb6390712 build chartsql endpoint 2015-01-31T23:12:08+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/937222d50b6f09ddd7c55f86c7ea67f62acacfde sql... 2015-01-31T23:09:25+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/0e713976444cc1f6a198d7bf9996131ea801f0b6 queryservice 2015-01-31T23:06:53+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/edfb4c61bb567320760325e8f32f99b0af4938f2 queryendpoint 2015-01-31T23:02:38+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/1cb418277246fadeb11224b31734e403cc82627b start new http, statsd server 2015-01-31T22:52:24+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/4782985ea0b4727c5794231a08fe865490c5392c fix fnordmetric server build 2015-01-31T22:37:50+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/0d0290343b5048cdc42dec83c8b5841833050932 merging with upstream libfnord WIP 2015-01-31T22:14:35+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/664ccd60daaf8f71bafa85c06f23c4eb89f2ac47 delete more dead code 2015-01-31T22:09:37+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/d5ab85a850d283f7c39ba86101985b62ab299c01 delete dead code 2015-01-31T22:09:10+00:00 Paul Asmuth paul@paulasmuth.com https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/d75b70d7fbed2ff6484769452c9aba239cda1240 Merge commit 'a1633ca8689f490ae43a6b18916a75f12d7885cc' into dev 2015-01-31T22:06:17+00:00 Paul Asmuth paul@paulasmuth.com Conflicts: 3rdparty/libfnord/fnordmetric-core/build/cmake/assets.sh 3rdparty/libfnord/fnordmetric-core/src/adminui.cc 3rdparty/libfnord/fnordmetric-core/src/chartsql/areachartbuilder.cc 3rdparty/libfnord/fnordmetric-core/src/chartsql/areachartbuilder.h 3rdparty/libfnord/fnordmetric-core/src/chartsql/barchartbuilder.cc 3rdparty/libfnord/fnordmetric-core/src/chartsql/barchartbuilder.h 3rdparty/libfnord/fnordmetric-core/src/chartsql/chartbuilder.h 3rdparty/libfnord/fnordmetric-core/src/chartsql/domainconfig.cc 3rdparty/libfnord/fnordmetric-core/src/chartsql/domainconfig.h 3rdparty/libfnord/fnordmetric-core/src/chartsql/drawstatement.cc 3rdparty/libfnord/fnordmetric-core/src/chartsql/drawstatement.h 3rdparty/libfnord/fnordmetric-core/src/chartsql/linechartbuilder.cc 3rdparty/libfnord/fnordmetric-core/src/chartsql/linechartbuilder.h 3rdparty/libfnord/fnordmetric-core/src/chartsql/pointchartbuilder.cc 3rdparty/libfnord/fnordmetric-core/src/chartsql/pointchartbuilder.h 3rdparty/libfnord/fnordmetric-core/src/chartsql/query.cc 3rdparty/libfnord/fnordmetric-core/src/chartsql/query.h 3rdparty/libfnord/fnordmetric-core/src/chartsql/query_test.cc 3rdparty/libfnord/fnordmetric-core/src/chartsql/queryservice.cc 3rdparty/libfnord/fnordmetric-core/src/chartsql/queryservice.h 3rdparty/libfnord/fnordmetric-core/src/chartsql/seriesadapter.cc 3rdparty/libfnord/fnordmetric-core/src/chartsql/seriesadapter.h 3rdparty/libfnord/fnordmetric-core/src/chartsql/sql_extensions_test.cc 3rdparty/libfnord/fnordmetric-core/src/cli.cc 3rdparty/libfnord/fnordmetric-core/src/cli/cli.cc 3rdparty/libfnord/fnordmetric-core/src/cli/cli.h 3rdparty/libfnord/fnordmetric-core/src/cli/cli_test.cc 3rdparty/libfnord/fnordmetric-core/src/environment.cc 3rdparty/libfnord/fnordmetric-core/src/environment.h 3rdparty/libfnord/fnordmetric-core/src/ffs/cowblob.h 3rdparty/libfnord/fnordmetric-core/src/ffs/objectref.h 3rdparty/libfnord/fnordmetric-core/src/ffs/volume.cc 3rdparty/libfnord/fnordmetric-core/src/ffs/volume.h 3rdparty/libfnord/fnordmetric-core/src/ffs/volume_test.cc 3rdparty/libfnord/fnordmetric-core/src/httpapi.cc 3rdparty/libfnord/fnordmetric-core/src/server.cc 3rdparty/libfnord/fnordmetric-core/src/sql/backends/backend.h 3rdparty/libfnord/fnordmetric-core/src/sql/backends/csv/csvbackend.cc 3rdparty/libfnord/fnordmetric-core/src/sql/backends/csv/csvbackend.h 3rdparty/libfnord/fnordmetric-core/src/sql/backends/csv/csvbackend_test.cc 3rdparty/libfnord/fnordmetric-core/src/sql/backends/csv/csvtableref.cc 3rdparty/libfnord/fnordmetric-core/src/sql/backends/csv/csvtableref.h 3rdparty/libfnord/fnordmetric-core/src/sql/backends/metricservice/metrictableref.cc 3rdparty/libfnord/fnordmetric-core/src/sql/backends/metricservice/metrictableref.h 3rdparty/libfnord/fnordmetric-core/src/sql/backends/metricservice/metrictablerepository.cc 3rdparty/libfnord/fnordmetric-core/src/sql/backends/metricservice/metrictablerepository.h 3rdparty/libfnord/fnordmetric-core/src/sql/backends/mysql/mysqlbackend.cc 3rdparty/libfnord/fnordmetric-core/src/sql/backends/mysql/mysqlbackend.h 3rdparty/libfnord/fnordmetric-core/src/sql/backends/mysql/mysqlconnection.cc 3rdparty/libfnord/fnordmetric-core/src/sql/backends/mysql/mysqltableref.cc 3rdparty/libfnord/fnordmetric-core/src/sql/backends/mysql/mysqltableref.h 3rdparty/libfnord/fnordmetric-core/src/sql/expressions/aggregate.cc 3rdparty/libfnord/fnordmetric-core/src/sql/expressions/aggregate.h 3rdparty/libfnord/fnordmetric-core/src/sql/expressions/boolean.cc 3rdparty/libfnord/fnordmetric-core/src/sql/expressions/boolean.h 3rdparty/libfnord/fnordmetric-core/src/sql/expressions/datetime.cc 3rdparty/libfnord/fnordmetric-core/src/sql/expressions/datetime.h 3rdparty/libfnord/fnordmetric-core/src/sql/expressions/math.cc 3rdparty/libfnord/fnordmetric-core/src/sql/expressions/math.h 3rdparty/libfnord/fnordmetric-core/src/sql/parser/astutil.cc 3rdparty/libfnord/fnordmetric-core/src/sql/parser/parser.h 3rdparty/libfnord/fnordmetric-core/src/sql/parser/token.cc 3rdparty/libfnord/fnordmetric-core/src/sql/runtime/compile.cc 3rdparty/libfnord/fnordmetric-core/src/sql/runtime/compile.h 3rdparty/libfnord/fnordmetric-core/src/sql/runtime/defaultruntime.cc 3rdparty/libfnord/fnordmetric-core/src/sql/runtime/defaultruntime.h 3rdparty/libfnord/fnordmetric-core/src/sql/runtime/execute.cc 3rdparty/libfnord/fnordmetric-core/src/sql/runtime/groupby.h 3rdparty/libfnord/fnordmetric-core/src/sql/runtime/groupovertimewindow.cc 3rdparty/libfnord/fnordmetric-core/src/sql/runtime/groupovertimewindow.h 3rdparty/libfnord/fnordmetric-core/src/sql/runtime/importstatement.cc 3rdparty/libfnord/fnordmetric-core/src/sql/runtime/importstatement.h 3rdparty/libfnord/fnordmetric-core/src/sql/runtime/limitclause.h 3rdparty/libfnord/fnordmetric-core/src/sql/runtime/orderby.cc 3rdparty/libfnord/fnordmetric-core/src/sql/runtime/orderby.h 3rdparty/libfnord/fnordmetric-core/src/sql/runtime/queryplan.cc 3rdparty/libfnord/fnordmetric-core/src/sql/runtime/queryplan.h 3rdparty/libfnord/fnordmetric-core/src/sql/runtime/queryplanbuilder.cc 3rdparty/libfnord/fnordmetric-core/src/sql/runtime/queryplanbuilder.h 3rdparty/libfnord/fnordmetric-core/src/sql/runtime/queryplannode.h 3rdparty/libfnord/fnordmetric-core/src/sql/runtime/resultlist.h 3rdparty/libfnord/fnordmetric-core/src/sql/runtime/rowsink.h 3rdparty/libfnord/fnordmetric-core/src/sql/runtime/runtime.cc 3rdparty/libfnord/fnordmetric-core/src/sql/runtime/runtime.h 3rdparty/libfnord/fnordmetric-core/src/sql/runtime/tablelessselect.h 3rdparty/libfnord/fnordmetric-core/src/sql/runtime/tablerepository.cc 3rdparty/libfnord/fnordmetric-core/src/sql/runtime/tablerepository.h 3rdparty/libfnord/fnordmetric-core/src/sql/runtime/tablescan.cc 3rdparty/libfnord/fnordmetric-core/src/sql/runtime/tablescan.h 3rdparty/libfnord/fnordmetric-core/src/sql/sql_test.cc 3rdparty/libfnord/fnordmetric-core/src/sql/svalue.cc 3rdparty/libfnord/fnordmetric-core/src/sql/svalue.h 3rdparty/libfnord/fnordmetric-core/src/util/format.h https://mirrors.sustech.edu.cn/git/github_fork/clip/-/commit/79f61a94e315ad77f9a37e1947d740bcd74957aa ... 2015-01-31T22:05:47+00:00 Paul Asmuth paul@paulasmuth.com