You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/05/22 21:54:49 UTC

[04/18] storm git commit: Merge pull request #13 from apache/master

Merge pull request #13 from apache/master

Merge from apache/storm to caofangkun/apache-storm

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

Branch: refs/heads/master
Commit: 146bd6b7b18f03b338df78431654d7c54fa0e8a4
Parents: f95938b 1ea378d
Author: caofangkun <ca...@gmail.com>
Authored: Wed Mar 18 09:17:37 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Wed Mar 18 09:17:37 2015 +0800

----------------------------------------------------------------------
 CHANGELOG.md                                    |  5 ++
 DEVELOPER.md                                    |  7 ++
 README.markdown                                 |  1 +
 SECURITY.md                                     | 23 ++++++
 external/storm-jdbc/README.md                   | 84 +++++++++++++-------
 .../apache/storm/jdbc/bolt/JdbcInsertBolt.java  | 36 +++++++--
 .../org/apache/storm/jdbc/common/Column.java    |  3 +-
 .../apache/storm/jdbc/common/JdbcClient.java    | 52 +++++++-----
 .../jdbc/mapper/SimpleJdbcLookupMapper.java     |  2 +-
 .../storm/jdbc/trident/state/JdbcState.java     | 18 ++++-
 .../storm/jdbc/common/JdbcClientTest.java       | 39 +++++----
 .../jdbc/topology/UserPersistanceTopology.java  |  2 +-
 storm-core/pom.xml                              |  3 +-
 storm-core/src/genthrift.sh                     | 13 ++-
 storm-core/src/java_license_header.txt          | 17 ++++
 storm-core/src/jvm/backtype/storm/Config.java   | 20 ++++-
 .../backtype/storm/messaging/netty/Client.java  |  4 +
 .../auth/authorizer/SimpleACLAuthorizer.java    | 42 +++++++---
 storm-core/src/py/storm/Nimbus-remote           |  0
 storm-core/src/py_license_header.txt            | 18 +++++
 .../backtype/storm/security/auth/auth_test.clj  | 16 ++++
 21 files changed, 312 insertions(+), 93 deletions(-)
----------------------------------------------------------------------