merge crate backend WIP

2015-02-01T02:00:37+00:00

Merge remote-tracking branch 'bogensberger/master' into crate_backend

2015-02-01T01:13:14+00:00

Conflicts: fnordmetric-core/build/cmake/CMakeLists.txt fnordmetric-core/src/metricdb/httpapi.cc fnordmetric-core/src/server.cc

cleaning up

2015-02-01T01:03:27+00:00

delete travis.yml

2015-02-01T01:01:28+00:00

make devserver fix

2015-02-01T00:58:02+00:00

webcomponents update

2015-02-01T00:43:59+00:00

cmake fix

2015-02-01T00:40:28+00:00

fontawesome fix

2015-02-01T00:36:15+00:00

adminui assets

2015-02-01T00:30:45+00:00

fix asset reg.

2015-02-01T00:21:18+00:00

build assets w/ cmake

2015-02-01T00:10:29+00:00

format.{cc,h}

2015-01-31T23:54:30+00:00

src/{fnordmetric, libfnord}

2015-01-31T23:52:45+00:00

adminui WIP

2015-01-31T23:37:31+00:00

build chartsql endpoint

2015-01-31T23:12:08+00:00

sql...

2015-01-31T23:09:25+00:00

queryservice

2015-01-31T23:06:53+00:00

queryendpoint

2015-01-31T23:02:38+00:00

start new http, statsd server

2015-01-31T22:52:24+00:00

fix fnordmetric server build

2015-01-31T22:37:50+00:00

merging with upstream libfnord WIP

2015-01-31T22:14:35+00:00

delete more dead code

2015-01-31T22:09:37+00:00

delete dead code

2015-01-31T22:09:10+00:00

Merge commit 'a1633ca8689f490ae43a6b18916a75f12d7885cc' into dev

2015-01-31T22:06:17+00:00

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

delete fnordmetric code

2015-01-31T22:04:58+00:00

fix include paths

2015-01-31T22:03:00+00:00

include libfnord

2015-01-31T21:56:06+00:00

Merge commit '5e2e859ca608ad60578c7cd864f5dbaa8c89fefd' as '3rdparty/libfnord'

2015-01-31T21:54:46+00:00

Squashed '3rdparty/libfnord/' content from commit e95f046

2015-01-31T21:54:46+00:00

git-subtree-dir: 3rdparty/libfnord git-subtree-split:

cmake...

2015-01-31T21:54:42+00:00

cmake

2015-01-31T21:50:51+00:00

delete ffs stuff

2015-01-31T21:45:15+00:00

simplify folder layout

2015-01-31T21:43:23+00:00

cleaning up

2015-01-31T21:40:16+00:00

remove libfnord

2015-01-31T21:39:09+00:00

fix build

2015-01-31T21:34:27+00:00

fix more includes

2015-01-31T21:29:25+00:00

Clip:e310d84feac8bb1781079ea9bd2dc9553adcbfab commits - 南方科技大学

merge crate backend WIP

Merge remote-tracking branch 'bogensberger/master' into crate_backend

cleaning up

delete travis.yml

make devserver fix

...

webcomponents update

cmake fix

fontawesome fix

adminui assets

fix asset reg.

build assets w/ cmake

format.{cc,h}

src/{fnordmetric, libfnord}

adminui WIP

TODO

build chartsql endpoint

sql...

queryservice

queryendpoint

start new http, statsd server

fix fnordmetric server build

merging with upstream libfnord WIP

delete more dead code

delete dead code

Merge commit 'a1633ca8689f490ae43a6b18916a75f12d7885cc' into dev

...

delete fnordmetric code

fix include paths

include libfnord

Merge commit '5e2e859ca608ad60578c7cd864f5dbaa8c89fefd' as '3rdparty/libfnord'

Squashed '3rdparty/libfnord/' content from commit e95f046

cmake...

cmake

delete ffs stuff

simplify folder layout

cleaning up

remove libfnord

fix build

fix more includes