FALCON-2308 - Minor fixes
diff --git a/CHANGES.txt b/CHANGES.txt
index 767c5a2..d2ba1f2 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,10 @@
For changes in releases after 0.10, please refer to "release-docs" or
https://github.com/apache/falcon/tree/master/release-docs/
+Release Version: 0.11
+For changes in release 0.11, please refer to "release-docs" or
+https://github.com/apache/falcon/blob/0.11/release-docs/0.11/CHANGES.0.11.md
+
Release Version: 0.10
For changes in release 0.10, please refer to "release-docs" or
https://github.com/apache/falcon/blob/0.10/release-docs/0.10/CHANGES.0.10.md
diff --git a/release-docs/0.11/CHANGES.0.11.md b/release-docs/0.11/CHANGES.0.11.md
index f68d617..8d1b1cc 100644
--- a/release-docs/0.11/CHANGES.0.11.md
+++ b/release-docs/0.11/CHANGES.0.11.md
@@ -59,6 +59,7 @@
| [FALCON-2197](https://issues.apache.org/jira/browse/FALCON-2197) | <span class="parentIssue">FALCON-2182</span> Add enable and disable option for an extension | extensions | Major | Pracheer Agarwal | Pallavi Rao |
| [FALCON-2189](https://issues.apache.org/jira/browse/FALCON-2189) | <span class="parentIssue">FALCON-2182</span> Falcon build is failing for falcon jpa service to be initialized before extension servivce | extensions | Major | sandeep samudrala | sandeep samudrala |
| [FALCON-2153](https://issues.apache.org/jira/browse/FALCON-2153) | <span class="parentIssue">FALCON-2170</span> Resetting Gauge value in BacklogEmitterService | common | Major | Praveen Adlakha | Praveen Adlakha |
+<<<<<<< HEAD
| [FALCON-2059](https://issues.apache.org/jira/browse/FALCON-2059) | BacklogMetricEmitter Service for Falcon | metrics | Major | pavan kumar kolamuri | pavan kumar kolamuri |
| [FALCON-2082](https://issues.apache.org/jira/browse/FALCON-2082) | Add CSRF filter for REST APIs | prism | Major | Ying Zheng | Ying Zheng |
| [FALCON-1596](https://issues.apache.org/jira/browse/FALCON-1596) | Spring shell based CLI for falcon | shell | Major | Praveen Adlakha | Rajat Khandelwal |
