You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by pa...@apache.org on 2017/10/26 09:50:27 UTC

[2/2] falcon git commit: FALCON-2308 - Minor fixes

FALCON-2308 - Minor fixes


Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/d83e4b8c
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/d83e4b8c
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/d83e4b8c

Branch: refs/heads/0.11
Commit: d83e4b8c23e036ea0aab99dd6b62572d8a0c7cd1
Parents: 4a1cf8b 645e571
Author: Pallavi Rao <pa...@inmobi.com>
Authored: Thu Oct 26 15:20:10 2017 +0530
Committer: Pallavi Rao <pa...@inmobi.com>
Committed: Thu Oct 26 15:20:10 2017 +0530

----------------------------------------------------------------------
 CHANGES.txt                       | 4 ++++
 release-docs/0.11/CHANGES.0.11.md | 1 +
 2 files changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/falcon/blob/d83e4b8c/release-docs/0.11/CHANGES.0.11.md
----------------------------------------------------------------------
diff --cc release-docs/0.11/CHANGES.0.11.md
index f68d617,9e48ffd..8d1b1cc
--- a/release-docs/0.11/CHANGES.0.11.md
+++ b/release-docs/0.11/CHANGES.0.11.md
@@@ -59,7 -58,6 +59,8 @@@ Non
  | [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 |