From 9973decff9d6abb23350351f59dc8409611b5683 Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Thu, 15 Nov 2018 12:16:24 -0500
Subject: [PATCH] changelog, versionbump (#2850)

---
 CHANGELOG.md         | 19 +++++++++++++++++++
 CHANGELOG_PENDING.md | 27 +++++++++++++++++----------
 version/version.go   |  2 +-
 3 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89c5cd8f8..bfdb9a50e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Changelog
 
+## v0.26.2
+
+*November 15th, 2018*
+
+Special thanks to external contributors on this release: @hleb-albau, @zhuzeyu
+
+Friendly reminder, we have a [bug bounty program](https://hackerone.com/tendermint).
+
+### FEATURES:
+
+- [rpc] [\#2582](https://github.com/tendermint/tendermint/issues/2582) Enable CORS on RPC API (@hleb-albau)
+
+### BUG FIXES:
+
+- [abci] [\#2748](https://github.com/tendermint/tendermint/issues/2748) Unlock mutex in localClient so even when app panics (e.g. during CheckTx), consensus continue working
+- [abci] [\#2748](https://github.com/tendermint/tendermint/issues/2748) Fix DATA RACE in localClient
+- [amino] [\#2822](https://github.com/tendermint/tendermint/issues/2822) Update to v0.14.1 to support compiling on 32-bit platforms
+- [rpc] [\#2748](https://github.com/tendermint/tendermint/issues/2748) Drain channel before calling Unsubscribe(All) in `/broadcast_tx_commit`
+
 ## v0.26.1
 
 *November 11, 2018*
diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md
index 0216dfb81..6494867d7 100644
--- a/CHANGELOG_PENDING.md
+++ b/CHANGELOG_PENDING.md
@@ -1,22 +1,29 @@
 # Pending
 
-## v0.26.2
+## v0.26.3
 
-*November 15th, 2018*
+*TBD*
 
 Special thanks to external contributors on this release:
 
-Friendly reminder, we have a [bug bounty program](https://hackerone.com/tendermint).
+Friendly reminder, we have a [bug bounty
+program](https://hackerone.com/tendermint).
 
-### FEATURES:
+### BREAKING CHANGES:
+
+* CLI/RPC/Config
+
+* Apps
+
+* Go API
+
+* Blockchain Protocol
 
-- [rpc] [\#2582](https://github.com/tendermint/tendermint/issues/2582) Enable CORS on RPC API
+* P2P Protocol
+
+
+### FEATURES:
 
 ### IMPROVEMENTS:
 
 ### BUG FIXES:
-
-- [abci] \#2748 Unlock mutex in localClient so even when app panics (e.g. during CheckTx), consensus continue working
-- [abci] \#2748 Fix DATA RACE in localClient
-- [amino] \#2822 Update to v0.14.1 to support compiling on 32-bit platforms
-- [rpc] \#2748 Drain channel before calling Unsubscribe(All) in `/broadcast_tx_commit`
diff --git a/version/version.go b/version/version.go
index b7a72a7f7..aae545129 100644
--- a/version/version.go
+++ b/version/version.go
@@ -18,7 +18,7 @@ const (
 	// TMCoreSemVer is the current version of Tendermint Core.
 	// It's the Semantic Version of the software.
 	// Must be a string because scripts like dist.sh read this file.
-	TMCoreSemVer = "0.26.1"
+	TMCoreSemVer = "0.26.2"
 
 	// ABCISemVer is the semantic version of the ABCI library
 	ABCISemVer  = "0.15.0"