Merge branch 'master' into 0.10.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c3cc4dc8 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c3cc4dc8 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c3cc4dc8 Branch: refs/heads/0.10.x-branch Commit: c3cc4dc893d3a3886e1c28745960df5268509d22 Parents: ea81f96 2154048 Author: P. Taylor Goetz <[email protected]> Authored: Wed Jun 3 20:39:38 2015 -0400 Committer: P. Taylor Goetz <[email protected]> Committed: Wed Jun 3 20:39:38 2015 -0400 ---------------------------------------------------------------------- .travis.yml | 11 + LICENSE | 4 +- conf/jaas_kerberos.conf | 17 ++ dev-tools/test-ns.py | 15 ++ doap_Storm.rdf | 6 +- external/flux/LICENSE | 202 ------------------- .../apache/storm/flux/test/SimpleTopology.java | 17 ++ .../storm/flux/test/SimpleTopologySource.java | 17 ++ .../test/SimpleTopologyWithConfigParam.java | 17 ++ .../org/apache/storm/flux/test/TestBolt.java | 17 ++ .../storm/flux/test/TridentTopologySource.java | 17 ++ .../existing-topology-method-override.yaml | 15 ++ .../existing-topology-reflection-config.yaml | 15 ++ .../configs/existing-topology-reflection.yaml | 15 ++ .../configs/existing-topology-trident.yaml | 15 ++ .../resources/configs/existing-topology.yaml | 15 ++ .../configs/invalid-existing-topology.yaml | 16 ++ .../src/test/resources/configs/test.properties | 16 ++ .../src/main/resources/config.properties | 15 ++ external/storm-hbase/LICENSE | 202 ------------------- .../storm/hive/trident/HiveStateFactory.java | 17 ++ .../apache/storm/hive/trident/HiveUpdater.java | 17 ++ external/storm-jdbc/LICENSE | 202 ------------------- .../storm/jdbc/common/ConnectionProvider.java | 17 ++ .../jdbc/common/HikariCPConnectionProvider.java | 17 ++ .../storm/jdbc/mapper/JdbcLookupMapper.java | 17 ++ .../jdbc/mapper/SimpleJdbcLookupMapper.java | 17 ++ external/storm-jdbc/src/test/sql/test.sql | 17 ++ .../ExponentialBackoffMsgRetryManagerTest.java | 17 ++ external/storm-redis/LICENSE | 202 ------------------- .../redis/trident/WordCountLookupMapper.java | 17 ++ .../redis/trident/WordCountStoreMapper.java | 17 ++ pom.xml | 17 +- storm-core/src/clj/backtype/storm/converter.clj | 15 ++ .../src/dev/drpc-simple-acl-test-scenario.yaml | 17 ++ .../storm/messaging/ConnectionWithStatus.java | 17 ++ .../auth/authorizer/DRPCAuthorizerBase.java | 17 ++ .../authorizer/DRPCSimpleACLAuthorizer.java | 18 ++ .../authorizer/ImpersonationAuthorizer.java | 17 ++ .../auth/kerberos/jaas_kerberos_cluster.conf | 20 +- .../auth/kerberos/jaas_kerberos_launcher.conf | 19 ++ .../worker-launcher/.deps/worker-launcher.Po | 16 ++ .../auth/DefaultHttpCredentialsPlugin_test.clj | 15 ++ .../authorizer/DRPCSimpleACLAuthorizer_test.clj | 15 ++ .../storm/security/auth/drpc-auth-alice.jaas | 17 ++ .../storm/security/auth/drpc-auth-bob.jaas | 17 ++ .../storm/security/auth/drpc-auth-charlie.jaas | 17 ++ .../storm/security/auth/drpc-auth-server.jaas | 17 ++ 48 files changed, 692 insertions(+), 817 deletions(-) ----------------------------------------------------------------------
