Commit a768beef authored by Paul Asmuth's avatar Paul Asmuth
Browse files

Merge branch 'master' of github.com:paulasmuth/fnordmetric 

Conflicts:
	fnordmetric-core/src/sstable/sstablereader.h
	fnordmetric-core/src/util/logger.cc
parents 632e2fb2 16ed5b76

fnordmetric-core/src/sstable/sstablereader.h

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ namespace sstable { 


class SSTableReader {

public:



  class SSTableReaderCursor : public sstable::Cursor {

  public:

    SSTableReaderCursor(

fnordmetric-core/src/util/outputstream.cc

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <fcntl.h>

#include <memory>

#include <string>

#include <cstdarg>

#include <unistd.h>

#include <fnordmetric/util/outputstream.h>

#include <fnordmetric/util/runtimeexception.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE