Merge branch 'STORM-1567-1.x' into 1.x-branch

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

Branch: refs/heads/1.x-branch
Commit: d25b4ccb56f36dd018c2ea3c5690e21063dead6e
Parents: a8381dd 8a695ab
Author: Jungtaek Lim <kabh...@gmail.com>
Authored: Fri Sep 23 10:01:16 2016 +0900
Committer: Jungtaek Lim <kabh...@gmail.com>
Committed: Fri Sep 23 10:01:16 2016 +0900

----------------------------------------------------------------------
 conf/defaults.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


Reply via email to