[34/50] storm git commit: Fix misplaced CHANGELOGs

[ka...@apache.org]

Fix misplaced CHANGELOGs

* STORM-1450 and STORM-1478 is merged to only master


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

Branch: refs/heads/1.x-branch
Commit: 9ea154c3412ab74a0c9159040079310d5c5b4038
Parents: 14fbc48
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Jan 21 07:26:09 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Jan 21 07:26:09 2016 +0900

----------------------------------------------------------------------
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/9ea154c3/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14bdeb7..bceb520 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## 2.0.0
  * STORM-1484: ignore subproject .classpath & .project file
+ * STORM-1450: Fix minor bugs and refactor code in ResourceAwareScheduler
+ * STORM-1478: make bolts getComponentConfiguration method cleaner/simpler
 
 ## 1.0.0
  * STORM-1452: Fixes profiling/debugging out of the box
@@ -7,8 +9,6 @@
  * STORM-1481: avoid Math.abs(Integer) get a negative value
  * STORM-1473: enable log search for daemon logs
  * STORM-1472: Fix the errorTime bug and show the time to be readable
- * STORM-1450: Fix minor bugs and refactor code in ResourceAwareScheduler
- * STORM-1478: make bolts getComponentConfiguration method cleaner/simpler
  * STORM-1482: add missing 'break' for RedisStoreBolt
  * STORM-1466: Move the org.apache.thrift7 namespace to something correct/sensible
  * STORM-1470: Applies shading to hadoop-auth, cleaner exclusions