From ac3b764b52868803fa16c37798228865477482b4 Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Tue, 10 Jul 2018 09:55:15 -0400
Subject: [PATCH] update changelog

---
 CHANGELOG.md | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f2d41465..0f15507c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,10 +5,18 @@
 *July 10th, 2018*
 
 IMPROVEMENTS
+- More cleanup post repo merge!
 - [docs] Include `ecosystem.json` and `tendermint-bft.md` from deprecated `aib-data` repository.
 - [config] Add `instrumentation.max_open_connections`, which limits the number
   of requests in flight to Prometheus server (if enabled). Default: 3.
 
+
+BUG FIXES
+- [rpc] Allow unquoted integers in requests
+    - NOTE: this is only for URI requests. JSONRPC requests and all responses
+      will use quoted integers (the proto3 JSON standard).
+- [consensus] Fix halt on shutdown
+
 ## 0.22.1
 
 *July 5th, 2018*
@@ -29,7 +37,14 @@ BUG FIXES
 *July 2nd, 2018*
 
 BREAKING CHANGES:
-- [config] Rename `skip_upnp` to `upnp`, and turn it off by default.
+- [config]
+    * Remove `max_block_size_txs` and `max_block_size_bytes` in favor of
+        consensus params from the genesis file.
+    * Rename `skip_upnp` to `upnp`, and turn it off by default.
+    * Change `max_packet_msg_size` back to `max_packet_msg_payload_size`
+- [rpc]
+    * All integers are encoded as strings (part of the update for Amino v0.10.1)
+    * `syncing` is now called `catching_up`
 - [types] Update Amino to v0.10.1
     * Amino is now fully proto3 compatible for the basic types
     * JSON-encoded types now use the type name instead of the prefix bytes
@@ -40,12 +55,6 @@ BREAKING CHANGES:
     * `tmlibs/merkle` -> `crypto/merkle`. Uses SHA256 instead of RIPEMD160
 - [tmlibs] Update to v0.9.0 and merge into `libs`
     * remove `merkle` package (moved to `crypto/merkle`)
-- [config] Remove `max_block_size_txs` and `max_block_size_bytes` in favor of
-  consensus params from the genesis file.
-- [config] Change `max_packet_msg_size` back to `max_packet_msg_payload_size`
-- [rpc]
-    * All integers are encoded as strings (part of the update for Amino v0.10.1)
-    * `syncing` is now called `catching_up`
 
 FEATURES
 - [cmd] Added metrics (served under `/metrics` using a Prometheus client;