Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge changes from nathanmarz/storm master #15

Merged
merged 62 commits into from
Jul 31, 2013
Merged

Commits on Apr 24, 2013

  1. change default ackers number into workers

    Yu L Li committed Apr 24, 2013
    Configuration menu
    Copy the full SHA
    e09cd94 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2013

  1. Update project.clj - Bump snakeyaml dependency version from 1.9 to 1.…

    …11 (Latest Release)
    
    Storm is using a snakeyaml version that is now two revisions old. I have recently come across a dependency conflict when using Storm with JRuby 1.7.3. When running in ruby 1.9 mode JRuby utilizes the snakeyaml library, however the internal JRuby  version of snakeyaml 1.11. Since Storm is running an outdated version, it would make sense to propose the change in hopes of resolving this dependency conflict.
    kb committed May 9, 2013
    Configuration menu
    Copy the full SHA
    b259294 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2013

  1. Merge pull request #580 from anfeng/master

    Enable java HashMap used for ZMQ messaging configuration
    nathanmarz committed May 30, 2013
    Configuration menu
    Copy the full SHA
    b20ea50 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2013

  1. Added schemas and validators to Config

    Details:
    * For every Config there is a schema of type Object named with the
      _SCHEMA suffix (e.g., TOPOLOGY_WORKERS_SCHEMA)
    * For simple Classes (String, Number, Boolean), just the Class is
      sufficient for the schema's value
    * For other Classes, instances of the FieldValidator interface are used.
    * FieldValidator declares a method to validate the field and a method to
      return a plain-language description of the criteria for the user.
    
    Status: Compiles, but not tested.  Nothing makes use of the schemas yet.
    Derek Dagit committed Jun 4, 2013
    Configuration menu
    Copy the full SHA
    9f761d8 View commit details
    Browse the repository at this point in the history
  2. Make messaging config Strings final

    Derek Dagit committed Jun 4, 2013
    Configuration menu
    Copy the full SHA
    6ac5994 View commit details
    Browse the repository at this point in the history
  3. Fix white-space in Config

    Derek Dagit committed Jun 4, 2013
    Configuration menu
    Copy the full SHA
    7922482 View commit details
    Browse the repository at this point in the history
  4. Remove unknown topology.acker.tasks config

    Derek Dagit committed Jun 4, 2013
    Configuration menu
    Copy the full SHA
    5b8cb78 View commit details
    Browse the repository at this point in the history
  5. Correct a few config schemas

    Derek Dagit committed Jun 4, 2013
    Configuration menu
    Copy the full SHA
    b88a81e View commit details
    Browse the repository at this point in the history
  6. Use schemas to check storm config/proof-of-concept

    Derek Dagit committed Jun 4, 2013
    Configuration menu
    Copy the full SHA
    19bb2ea View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2013

  1. Millisecond-level tick generation granularity

    Tudor Scurtu committed Jun 6, 2013
    Configuration menu
    Copy the full SHA
    840fe5a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0fca303 View commit details
    Browse the repository at this point in the history
  3. Removed debugging statement

    smelody committed Jun 6, 2013
    Configuration menu
    Copy the full SHA
    cf4a4d0 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2013

  1. Configuration menu
    Copy the full SHA
    f0c0bba View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2013

  1. Fix for port allocation errors during tests

    Kyle Nusbaum committed Jun 14, 2013
    Configuration menu
    Copy the full SHA
    0e68cf9 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2013

  1. Merge pull request #14 from nathanmarz/master

    merge changes from nathanmarz/storm master
    anfeng committed Jun 18, 2013
    Configuration menu
    Copy the full SHA
    9518035 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4b35581 View commit details
    Browse the repository at this point in the history
  3. add web ui for :

    1. viewing log file
    2. get/set log4j log level online
    xiaokang committed Jun 18, 2013
    Configuration menu
    Copy the full SHA
    33eea52 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2013

  1. Configuration menu
    Copy the full SHA
    fb11b76 View commit details
    Browse the repository at this point in the history
  2. Launch workers with id and port properties

    Derek Dagit committed Jun 21, 2013
    Configuration menu
    Copy the full SHA
    e5dd051 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #594 from knusbaum/port-allocation-fix

    Fix for port allocation errors during tests
    nathanmarz committed Jun 21, 2013
    Configuration menu
    Copy the full SHA
    bf08c9e View commit details
    Browse the repository at this point in the history
  4. Merge pull request #602 from d2r/launch-workers-with-id-properties

    Launch workers with id and port properties
    nathanmarz committed Jun 21, 2013
    Configuration menu
    Copy the full SHA
    6ea81d8 View commit details
    Browse the repository at this point in the history
  5. update changelog

    nathanmarz committed Jun 21, 2013
    Configuration menu
    Copy the full SHA
    463f6f7 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    35c64a3 View commit details
    Browse the repository at this point in the history
  7. cleanup long casting

    nathanmarz committed Jun 21, 2013
    Configuration menu
    Copy the full SHA
    b2fc309 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    5d4bb6a View commit details
    Browse the repository at this point in the history
  9. update readme/changelog

    nathanmarz committed Jun 21, 2013
    Configuration menu
    Copy the full SHA
    fd5754b View commit details
    Browse the repository at this point in the history
  10. cd ../..

    anfeng committed Jun 21, 2013
    Configuration menu
    Copy the full SHA
    cda7482 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2013

  1. Configuration menu
    Copy the full SHA
    0b2a2c3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    077efd3 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2013

  1. added drpc.childopts config

    strongh committed Jun 25, 2013
    Configuration menu
    Copy the full SHA
    f5455a0 View commit details
    Browse the repository at this point in the history
  2. remove errant character

    strongh committed Jun 25, 2013
    Configuration menu
    Copy the full SHA
    97f5fae View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2013

  1. Merge pull request #597 from anfeng/messaging

    build_release.sh  modified to avoid duplicated storm-core.jar files
    nathanmarz committed Jul 9, 2013
    Configuration menu
    Copy the full SHA
    0ba0e3e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b93bda5 View commit details
    Browse the repository at this point in the history
  3. remove UI template from log because it doesn't link to right place, r…

    …emove 'log' from port display
    nathanmarz committed Jul 9, 2013
    Configuration menu
    Copy the full SHA
    c4d4b81 View commit details
    Browse the repository at this point in the history
  4. update changelog

    nathanmarz committed Jul 9, 2013
    Configuration menu
    Copy the full SHA
    369c7fe View commit details
    Browse the repository at this point in the history
  5. Merge pull request #609 from strongh/drpc-childopts

    Add `drpc.childopts` config
    nathanmarz committed Jul 9, 2013
    Configuration menu
    Copy the full SHA
    f21bbfb View commit details
    Browse the repository at this point in the history
  6. update readme/changelog

    nathanmarz committed Jul 9, 2013
    Configuration menu
    Copy the full SHA
    9d38180 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #567 from kb/patch-1

    Update project.clj - Bump snakeyaml dependency version from 1.9 to 1.11 (Latest Release)
    nathanmarz committed Jul 9, 2013
    Configuration menu
    Copy the full SHA
    cb45c17 View commit details
    Browse the repository at this point in the history
  8. Merge branch 'default_ackers1' of git://github.com/lyogavin/storm int…

    …o lyogavin-default_ackers1
    nathanmarz committed Jul 9, 2013
    Configuration menu
    Copy the full SHA
    a231edd View commit details
    Browse the repository at this point in the history
  9. update changelog

    nathanmarz committed Jul 9, 2013
    Configuration menu
    Copy the full SHA
    6100478 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    a29958c View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2013

  1. Move validators to own file, add tests

    Other cosmetic changes.
    Derek Dagit committed Jul 10, 2013
    Configuration menu
    Copy the full SHA
    f9cf61d View commit details
    Browse the repository at this point in the history
  2. Merge remote branch 'marz/master' into add-config-schema-validation

    Conflicts:
    	conf/defaults.yaml
    	storm-core/src/jvm/backtype/storm/Config.java
    Derek Dagit committed Jul 10, 2013
    Configuration menu
    Copy the full SHA
    6e5c35a View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2013

  1. update changelog

    nathanmarz committed Jul 11, 2013
    Configuration menu
    Copy the full SHA
    1b28ab4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d80eded View commit details
    Browse the repository at this point in the history
  3. Merge pull request #487 from ptgoetz/testing-batch-fix

    make FixedBatchSpout batch aware.
    nathanmarz committed Jul 11, 2013
    Configuration menu
    Copy the full SHA
    59cdf96 View commit details
    Browse the repository at this point in the history
  4. update changelog

    nathanmarz committed Jul 11, 2013
    Configuration menu
    Copy the full SHA
    46c3ba7 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2013

  1. Configuration menu
    Copy the full SHA
    171b320 View commit details
    Browse the repository at this point in the history
  2. 0.9.0-wip20

    nathanmarz committed Jul 17, 2013
    Configuration menu
    Copy the full SHA
    77a39ff View commit details
    Browse the repository at this point in the history
  3. fix thrift

    nathanmarz committed Jul 17, 2013
    Configuration menu
    Copy the full SHA
    ab31578 View commit details
    Browse the repository at this point in the history
  4. bump version

    nathanmarz committed Jul 17, 2013
    Configuration menu
    Copy the full SHA
    05fb469 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2013

  1. Includes key in invalid config exception message

    Derek Dagit committed Jul 18, 2013
    Configuration menu
    Copy the full SHA
    8996825 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #631 from d2r/d2r-add-key-to-config-validation-exc…

    …eptions
    
    Includes key in invalid config exception message
    nathanmarz committed Jul 18, 2013
    Configuration menu
    Copy the full SHA
    470e7cd View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2013

  1. fix topology.metrics.consumer.register validation: Map, not String

    The topology.metrics.consumer.register is a list of hashes, but its schema was StringsValidator. Added a 'MapsValidator' (list of Map) and fixed the schema.
    Philip (flip) Kromer committed Jul 21, 2013
    Configuration menu
    Copy the full SHA
    af49781 View commit details
    Browse the repository at this point in the history
  2. LoggingMetricsConsumer dumps metrics to log file

    * Added a LoggingMetricsConsumer example of a MetricsConsumer. Use it by adding 'conf.registerMetricsConsumer(LoggingMetricsConsumer.class);' when you construct your topology.
    * Added a dedicated appender to the example logback/cluster.xml called METRICS.
      Its log format omits the class and priority since with the dedicated appender those are redu
    Philip (flip) Kromer committed Jul 21, 2013
    Configuration menu
    Copy the full SHA
    ef94d01 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2013

  1. Merge pull request #585 from srmelody/master

    Specify jvm_opts when calling storm jar
    nathanmarz committed Jul 25, 2013
    Configuration menu
    Copy the full SHA
    be86eea View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    56e1f14 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2013

  1. Error if opaque value's txId is ahead of batchTxId

    Philip (flip) Kromer committed Jul 29, 2013
    Configuration menu
    Copy the full SHA
    9ae9264 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2013

  1. Merge pull request #636 from infochimps-labs/opqval_error_checking

    Throw Exception if OpaqueValue's txId is ahead of batchTxId
    nathanmarz committed Jul 31, 2013
    Configuration menu
    Copy the full SHA
    634055d View commit details
    Browse the repository at this point in the history
  2. update changelog

    nathanmarz committed Jul 31, 2013
    Configuration menu
    Copy the full SHA
    386b824 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #635 from infochimps-labs/metrics_logging_consumer

    LoggingMetricsConsumer, to dump metrics to log file
    nathanmarz committed Jul 31, 2013
    Configuration menu
    Copy the full SHA
    e61d910 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #634 from infochimps-labs/metrics_validation_fix

    fix topology.metrics.consumer.register validation: Map, not String
    nathanmarz committed Jul 31, 2013
    Configuration menu
    Copy the full SHA
    a0763ee View commit details
    Browse the repository at this point in the history