From f919712920785db3aa000d76fb9c24a64f7be001 Mon Sep 17 00:00:00 2001
From: Todd Persen <todd.persen@gmail.com>
Date: Mon, 16 Mar 2015 15:49:25 -0700
Subject: [PATCH 1/3] Remove some outdated docs.

---
 docs/STANDARD_RESPONSES.md |  6 ---
 docs/cluster_notes.txt     | 86 --------------------------------------
 docs/design_notes.md       | 82 ------------------------------------
 docs/packaging.md          | 30 -------------
 4 files changed, 204 deletions(-)
 delete mode 100644 docs/STANDARD_RESPONSES.md
 delete mode 100644 docs/cluster_notes.txt
 delete mode 100644 docs/design_notes.md
 delete mode 100644 docs/packaging.md

diff --git a/docs/STANDARD_RESPONSES.md b/docs/STANDARD_RESPONSES.md
deleted file mode 100644
index c89f938d4d..0000000000
--- a/docs/STANDARD_RESPONSES.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Questions on Github issues
-
-Hi, github issues are reserved for bugs and/or features
-discussions. Please email your questions to the mailing list or hit us
-up on the irc channel. You can find more info on the
-[community page](http://influxdb.com/community/)
diff --git a/docs/cluster_notes.txt b/docs/cluster_notes.txt
deleted file mode 100644
index 7adca28e57..0000000000
--- a/docs/cluster_notes.txt
+++ /dev/null
@@ -1,86 +0,0 @@
-make integration_test verbose=on only=TestRestartServers
-
-parts to create:
-
-protobuf server
-protobuf client
-
-Coordinator has Datastore and ConcensusEngine
-ConsensusEngine has a collection of ClusterServers (one is the localhost) and the ProtobufServer
-
-ClusterServer has protobuf client (automatically tries to connect unless it's localhost)
-ProtobufServer has a datastore to answer queries
-
-
-ringLocations: [{servers: []}, {servers: []}]
-
-startup:
-create db
-start protobuf server
-start clusterConsensus
-  for each server, createClient and connect
-
-write comes in:
-split it into discreet ring locations (time series objects with points all on the same ring loc)
-  ring location is figured by hashing db, series, and time (rounded to 5 min interval)
-proxy to one of the servers that have the ring location
-
-On the server we proxied to...
-log the write...
-  assign the operation a sequence number (should be an operation sequence number, have one per ring location)
-  assign points sequence numbers (can have one global incrementer)
-  log it -
-  <ring location><operation sequence><timestamp><db, series id> - serialized operation
-
-  attempt to write to other servers in ring
-    receiving server tracks for a given server id and ring location, what the last sequence was
-    for receiving server, if it's not the next in the sequence, set aside and request missing ops
-
-  write the value to key:
-  <db/series/column id><timestamp><sequence>
-
-point sequence numbers:
-  first two bytes is the server id. Guaranteed unique in a cluster
-  the other six bytes are the sequence number. 
-
-every 5 minutes create a marker
-  <sequence marker prefix><ring location><time stamp> - <sequence number>
-
-deleting series data
-  delete the values and do compactions.
-  for each ring location:
-    look up the sequence number for the time frame of the start of the deletion. Seek there and iterate over keys
-      if <db, series id> matches and timestamp in range, delete.
-      if timestamp out of range, break
-    run compaction for ring location range
-
-every x seconds each server asks the other servers that own its ring locations to replay operations from a given sequence number
-
-joining a server to a cluster:
-  figure out ring locations
-  ask servers to replay operations for ring locations from previous
-  tell old server to drop log and index data:
-    go through ring locations, read serialized operations, if it's a write then delete the corresponding values.
-    compact the ring log, let the points index compact gradually on its own
-
-example of expanding cluster:
-rf: 1, 2, 3
-
-A 0-3333
-B 3334 - 6666
-C 6667 - 9999
-
-A 0-2499
-  rf 1 [0-3333]    -> [0-2499]    del: (2499-3333)
-  rf 2 [6667-3333] -> [7500-2499] del: (2499-3333, 6667-7500)
-  rf 3 [3334-3333] -> [5000-2499] del: (2499-4999)
-B 2500-4999
-  rf 1 [3334-6666] -> [2500-4999] del: (5000-6666)
-  rf 2 [0-6666]    -> [0-4999]    del: (5000-6666)
-  rf 3 [6667-6666] -> [7500-4999] del: (5000-7500)
-C 5000-7499
-  rf 1 [6667-9999] -> [5000-7499] del: (7500-9999)
-  rf 2 [3334-9999] -> [2500-7499] del: (7500-9999)
-  rf 3 [0-9999]    -> [0-7499]    del: (7500-9999)
-D 7500-9999
-  all butter...
\ No newline at end of file
diff --git a/docs/design_notes.md b/docs/design_notes.md
deleted file mode 100644
index d18916d431..0000000000
--- a/docs/design_notes.md
+++ /dev/null
@@ -1,82 +0,0 @@
-Just some notes about requirements, design, and clustering.
-
-Scalable datastore for metrics, events, and real-time analytics
-
-Requirements
-------------
-
-* horizontally scalable
-* http interface
-* udp interface (low priority)
-* persistent
-* metadata for time series (low priority)
-* perform functions quickly (count, unique, sum, etc.)
-* group by time intervals (e.g. count ticks every 5 minutes)
-* joining multiple time series to generate new timeseries
-* schema-less
-* sql-like query language
-* support multiple databases with authentication
-* single time series should scale horizontally (no hot spots)
-* dynamic cluster changes and data balancing
-* pubsub layer
-* continuous queries (keep connection open and return new points as they arrive)
-* Delete ranges of points from any number of timeseries (that should reflect in disk space usage)
-* querying should support one or more timeseries (possibly with regex to match on)
-
-New Requirements
-----------------
-* Easy to backup and restore
-* Large time range queries with one column ?
-* Optimize for HDD access ?
-* What are the common use cases that we should optimize for ?
-
-Modules
--------
-
-
-           +--------------------+   +--------------------+
-           |                    |   |                    |
-           |  WebConsole/docs   |   |      Http API      |
-           |                    |   |                    |
-           +------------------+-+   +-+------------------+
-                              |       |
-                              |       |
-                        +-----+-------+-----------+
-                        |                         |
-                        |  Lang. Bindings         |
-                        |                         |
-                        +-----------------+       |
-                        |                 |       |
-                        |   Query Engine  |       |
-                        |                 |       |
-                        +-----------------+-------+
-                        |                         |
-                   +----+ Coordinator (consensus) +-----+
-                   |    |                         |     |
-                   |    +-------------------------+     |
-                   |                                    |
-                   |                                    |
-          +--------+-----------+                +-------+------------+
-          |                    |                |                    |
-          |   Storage Engine   |                |   Storage Engine   |
-          |                    |                |                    |
-          +--------+-----------+                +-------+------------+
-
-Replication & Consensus Notes
------------------------------
-
-Single raft cluster for which machines are in cluster and who owns which locations.
-1. When a write comes into a server, figure out which machine owns the data, proxy out to that.
-2. The machine proxies to the server, which assigns a sequence number
-3. Each machine in the cluster asks the other machines that own hash ring locations what their latest sequence number is every 10 seconds (this is read repair)
-
-For example, take machines A, B, and C. Say B and C own ring location #2. If a write comes into A it will look up the configuration and pick B or C at random to proxy the write to. Say it goes to B. B assigns a sequence number of 1. It keeps a log for B2 of the writes. It will also keep a log for C2's writes. It then tries to write #1 to C.
-
-If the write is marked as a quorum write, then B won't return a success to A until the data has been written to both B and C. Every so often both B and C will ask each other what their latest writes are.
-
-Taking the example further, if we had server D that also owned ring location 2. B would ask C for writes to C2. If C is down it will ask D for writes to C2. This will ensure that if C fails no data will be lost.
-
-Coding Style
-------------
-
-1. Public functions should be at the top of the file, followed by a comment `// private functions` and all private functions.
diff --git a/docs/packaging.md b/docs/packaging.md
deleted file mode 100644
index 73871fcd9e..0000000000
--- a/docs/packaging.md
+++ /dev/null
@@ -1,30 +0,0 @@
-### Packaging
-
-In order to support all distros and old libc we build and package on
-centos6.4 (64 bit). The package script takes care of cross compiling
-Influxdb for 32bit architectures.
-
-TODO: move the following to chef recipe.
-
-Below are the steps needed to setup a centos6.4 vm to build Influxdb.
-
-```
-sudo yum install git-core glibc.i686 hg bzr protobuf-compiler glibc-devel.i686 libstdc++.i686 libstdc++-devel.i686 python-pip
-sudo pip install --upgrade awscli
-git clone git@github.com:influxdb/influxdb.git
-wget http://go.googlecode.com/files/go1.1.2.linux-amd64.tar.gz
-mkdir bin
-cd bin
-tar -xzvf ../go1.1.2.linux-amd64.tar.gz
-mv go go1.1.2
-ln -s go1.1.2 go
-cd ..
-curl -L https://get.rvm.io | bash -s stable
-rvm install 1.9.3
-cd influxdb/
-git clean -dfx
-git checkout .
-git pull --rebase
-# PATH=$HOME/bin/go/bin:$PATH GOROOT=~/bin/go/ ./test.sh
-PATH=$HOME/bin/go/bin:$PATH GOROOT=~/bin/go/ ./release.sh 0.1.1.rc3
-```

From 20b0c524847129dbe5f27868fbc9f39b5dc9be0a Mon Sep 17 00:00:00 2001
From: Cory LaNou <cory@lanou.com>
Date: Tue, 17 Mar 2015 07:37:08 -0600
Subject: [PATCH 2/3] fixing config print startup statement

---
 cmd/influxd/main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/influxd/main.go b/cmd/influxd/main.go
index 7acc1b9476..d67cb9568c 100644
--- a/cmd/influxd/main.go
+++ b/cmd/influxd/main.go
@@ -104,7 +104,7 @@ func execRun(args []string) {
 	log.SetFlags(log.LstdFlags)
 	writePIDFile(*pidPath)
 
-	if configPath != nil {
+	if *configPath == "" {
 		log.Println("No config provided, using default settings")
 	}
 	config := parseConfig(*configPath, *hostname)

From 4ccd692daf058236e1e0743ce0ab7fd0c43170ae Mon Sep 17 00:00:00 2001
From: Cory LaNou <cory@lanou.com>
Date: Tue, 17 Mar 2015 08:31:32 -0600
Subject: [PATCH 3/3] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e502839bd2..dc06f23888 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - [#1971](https://github.com/influxdb/influxdb/pull/1971): Fix leader id initialization.
 - [#1975](https://github.com/influxdb/influxdb/pull/1975): Require `q` parameter for query endpoint.
 - [#1969](https://github.com/influxdb/influxdb/pull/1969): Print loaded config.
+- [#1987](https://github.com/influxdb/influxdb/pull/1987): Fix config print startup statement for when no config is provided.
 
 ## v0.9.0-rc12 [2015-03-15]