Merge branch 'STORM-2301-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/974cd211
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/974cd211
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/974cd211

Branch: refs/heads/1.x-branch
Commit: 974cd2111afe061d1a6dca952f23f76a62a465fa
Parents: 08fe254 3612a99
Author: Jungtaek Lim <kabh...@gmail.com>
Authored: Tue Jan 24 12:00:10 2017 +0900
Committer: Jungtaek Lim <kabh...@gmail.com>
Committed: Tue Jan 24 12:00:10 2017 +0900

----------------------------------------------------------------------
 external/storm-cassandra/pom.xml                |  2 +-
 .../query/impl/PreparedStatementBinder.java     | 68 ++------------------
 .../query/impl/RoutingKeyGenerator.java         |  7 +-
 3 files changed, 9 insertions(+), 68 deletions(-)
----------------------------------------------------------------------


Reply via email to