Merge branch 'druid-changes1.x' of https://github.com/omkreddy/storm into STORM-2098-1.x
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f0741f69 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f0741f69 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f0741f69 Branch: refs/heads/1.x-branch Commit: f0741f690d0b7df8cc656d9227c9d3b5205feab2 Parents: da35dab 8a0776d Author: Satish Duggana <sdugg...@hortonworks.com> Authored: Mon Sep 19 13:57:07 2016 +0530 Committer: Satish Duggana <sdugg...@hortonworks.com> Committed: Mon Sep 19 13:57:07 2016 +0530 ---------------------------------------------------------------------- CHANGELOG.md | 1 + .../main/java/org/apache/storm/druid/bolt/DruidBeamBolt.java | 4 ++-- .../java/org/apache/storm/druid/SampleDruidBoltTopology.java | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
