diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3d072a592..8a0a84296e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,20 @@
 - [#7856](https://github.com/influxdata/influxdb/issues/7856): Failed points during an import now result in a non-zero exit code.
 - [#7821](https://github.com/influxdata/influxdb/issues/7821): Expose some configuration settings via SHOW DIAGNOSTICS
 
+## v1.2.2 [2017-03-14]
+
+### Release Notes
+
+### Configuration Changes
+
+#### `[http]` Section
+
+* `max-row-limit` now defaults to `0`.  The previous default was `10000`, but due to a bug, the value in use since `1.0` was `0`.
+
+### Bugfixes
+
+- [#8050](https://github.com/influxdata/influxdb/issues/8050): influxdb & grafana, absence of data on the graphs
+
 ## v1.2.1 [2017-03-08]
 
 ### Release Notes
diff --git a/etc/config.sample.toml b/etc/config.sample.toml
index c55bc5a417..4df63186b2 100644
--- a/etc/config.sample.toml
+++ b/etc/config.sample.toml
@@ -240,7 +240,7 @@
   # shared-sercret = ""
 
   # The default chunk size for result sets that should be chunked.
-  # max-row-limit = 10000
+  # max-row-limit = 0
 
   # The maximum number of HTTP connections that may be open at once.  New connections that
   # would exceed this limit are dropped.  Setting this value to 0 disables the limit.
diff --git a/services/httpd/config.go b/services/httpd/config.go
index 0e699a780d..3f42fbeffd 100644
--- a/services/httpd/config.go
+++ b/services/httpd/config.go
@@ -41,7 +41,7 @@ func NewConfig() Config {
 		PprofEnabled:      true,
 		HTTPSEnabled:      false,
 		HTTPSCertificate:  "/etc/ssl/influxdb.pem",
-		MaxRowLimit:       DefaultChunkSize,
+		MaxRowLimit:       0,
 		Realm:             DefaultRealm,
 		UnixSocketEnabled: false,
 		BindSocket:        DefaultBindSocket,
diff --git a/tests/server_test.go b/tests/server_test.go
index 838e42dc57..f69835b93a 100644
--- a/tests/server_test.go
+++ b/tests/server_test.go
@@ -6081,7 +6081,7 @@ func TestServer_Query_Chunk(t *testing.T) {
 	}
 
 	writes := make([]string, 10001) // 10,000 is the default chunking size, even when no chunking requested.
-	expectedValues := make([]string, 10000)
+	expectedValues := make([]string, len(writes))
 	for i := 0; i < len(writes); i++ {
 		writes[i] = fmt.Sprintf(`cpu value=%d %d`, i, time.Unix(0, int64(i)).UnixNano())
 		if i < len(expectedValues) {