Commit d75b70d7 authored Jan 31, 2015 by Paul Asmuth

Merge commit 'a1633ca8' into dev

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

parents 79f61a94 a1633ca8

3rdparty/libfnord/fnordmetric-core/Makefile

deleted100644 → 0

+0 −25

Original line number	Diff line number	Diff line
		# This file is part of the "FnordMetric" project
		# Copyright (c) 2014 Paul Asmuth, Google Inc.
		#
		# Licensed under the MIT license (see LICENSE).

		all: build

		build:
		(cd build/cmake && make)

		install: build
		(cd build/cmake && make install)

		devserver: build
		mkdir -p /tmp/fnordmetric-data
		DEV_ASSET_PATH=./build/assets ./build/cmake/target/fnordmetric-server --datadir /tmp/fnordmetric-data --verbose

		test:
		(cd build/cmake && make test)

		clean:
		(cd build/cmake && make clean)
		rm -rf build/test/tmp*

		.PHONY: all test clean build devserver

3rdparty/libfnord/fnordmetric-core/autogen.sh

deleted100755 → 0

+0 −7

Original line number	Diff line number	Diff line
		#!/bin/bash
		if [[ "$1" == "clean" ]]; then
		make clean
		exit 0
		fi

		make all

3rdparty/libfnord/fnordmetric-core/build/.gitignore

deleted100644 → 0

+0 −3

Original line number	Diff line number	Diff line
		libfnordmetric-static.a
		libfnordmetric.dylib
		libfnordmetric.so

3rdparty/libfnord/fnordmetric-core/build/assets/fnord

deleted120000 → 0

+0 −1

Original line number	Diff line number	Diff line
		../../../libfnord/webui
		No newline at end of file

3rdparty/libfnord/fnordmetric-core/build/assets/fnordmetric

deleted120000 → 0

+0 −1

Original line number	Diff line number	Diff line
		../../../fnordmetric-webui
		No newline at end of file

Admin message