Merge branch 'storm-856-use-ser-delay-secs' of github.com:d2r/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f6e2ad06 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f6e2ad06 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f6e2ad06 Branch: refs/heads/master Commit: f6e2ad063c6a9fef98ed2acd1f824a005daae5d1 Parents: 27bc183 128ee14 Author: P. Taylor Goetz <[email protected]> Authored: Tue Jun 9 21:20:10 2015 -0400 Committer: P. Taylor Goetz <[email protected]> Committed: Tue Jun 9 21:20:10 2015 -0400 ---------------------------------------------------------------------- storm-core/src/clj/backtype/storm/converter.clj | 11 +++++++---- storm-core/src/clj/backtype/storm/daemon/nimbus.clj | 8 ++++++-- 2 files changed, 13 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
