GitHub user haoch opened a pull request:

    https://github.com/apache/incubator-eagle/pull/212

    Branch 0.5 fix license

    

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/haoch/incubator-eagle branch-0.5-fix-license

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/incubator-eagle/pull/212.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #212
    
----
commit 614c118ef3d739cccb18bdeed0bbdb58b757649f
Author: Ralph, Su <[email protected]>
Date:   2016-06-01T05:59:41Z

    EAGLE-324 Init branch-v0.5

commit 19371afd45d3a91f9a1d12edd758e0fbc9dbd083
Author: Hao Chen <[email protected]>
Date:   2016-06-01T15:06:59Z

    Fix license missing issues

commit 61cff6dbfc1613ef0a5b7ad24ab44af14024f5f7
Author: Hao Chen <[email protected]>
Date:   2016-06-01T15:13:19Z

    Merge branch 'branch-0.5' of 
https://git-wip-us.apache.org/repos/asf/incubator-eagle into branch-0.5
    
    Conflicts:
        eagle-core/eagle-alert/alert/README.md
        eagle-core/eagle-alert/alert/alert-assembly/pom.xml
        
eagle-core/eagle-alert/alert/alert-assembly/src/assembly/alert-assembly.xml
        
eagle-core/eagle-alert/alert/alert-common/src/main/java/org/apache/eagle/alert/config/ConfigBusBase.java
        
eagle-core/eagle-alert/alert/alert-common/src/main/java/org/apache/eagle/alert/config/ConfigBusConsumer.java
        
eagle-core/eagle-alert/alert/alert-common/src/main/java/org/apache/eagle/alert/config/ConfigBusProducer.java
        
eagle-core/eagle-alert/alert/alert-common/src/main/java/org/apache/eagle/alert/config/ConfigChangeCallback.java
        
eagle-core/eagle-alert/alert/alert-common/src/main/java/org/apache/eagle/alert/config/ConfigValue.java
        
eagle-core/eagle-alert/alert/alert-common/src/main/java/org/apache/eagle/alert/config/ZKConfig.java
        
eagle-core/eagle-alert/alert/alert-common/src/main/java/org/apache/eagle/alert/config/ZKConfigBuilder.java
        
eagle-core/eagle-alert/alert/alert-common/src/main/java/org/apache/eagle/alert/coordination/model/PolicyWorkerQueue.java
        
eagle-core/eagle-alert/alert/alert-common/src/main/java/org/apache/eagle/alert/coordination/model/StreamNameSelector.java
        
eagle-core/eagle-alert/alert/alert-common/src/main/java/org/apache/eagle/alert/coordination/model/StreamRepartitionMetadata.java
        
eagle-core/eagle-alert/alert/alert-common/src/main/java/org/apache/eagle/alert/coordination/model/Tuple2StreamConverter.java
        
eagle-core/eagle-alert/alert/alert-common/src/main/java/org/apache/eagle/alert/coordination/model/Tuple2StreamMetadata.java
        
eagle-core/eagle-alert/alert/alert-common/src/main/java/org/apache/eagle/alert/engine/model/StreamEventBuilder.java
        
eagle-core/eagle-alert/alert/alert-common/src/main/java/org/apache/eagle/alert/metric/reporter/KafkaReporter.java
        
eagle-core/eagle-alert/alert/alert-common/src/main/java/org/apache/eagle/alert/utils/AlertConstants.java
        
eagle-core/eagle-alert/alert/alert-common/src/main/java/org/apache/eagle/alert/utils/ByteUtils.java
        
eagle-core/eagle-alert/alert/alert-common/src/main/java/org/apache/eagle/alert/utils/ConfigUtils.java
        
eagle-core/eagle-alert/alert/alert-common/src/main/java/org/apache/eagle/alert/utils/HostUtils.java
        
eagle-core/eagle-alert/alert/alert-common/src/main/java/org/apache/eagle/alert/utils/StreamIdConversion.java
        
eagle-core/eagle-alert/alert/alert-common/src/test/resources/application.conf
        eagle-core/eagle-alert/alert/alert-coordinator/pom.xml
        
eagle-core/eagle-alert/alert/alert-coordinator/src/main/java/org/apache/eagle/alert/coordinator/trigger/DynamicPolicyLoader.java
        
eagle-core/eagle-alert/alert/alert-coordinator/src/main/java/org/apache/eagle/alert/coordinator/trigger/PolicyChangeListener.java
        
eagle-core/eagle-alert/alert/alert-coordinator/src/main/resources/application.conf
        
eagle-core/eagle-alert/alert/alert-coordinator/src/test/resources/test-application.conf
        eagle-core/eagle-alert/alert/alert-devtools/bin/start-integration1.sh
        eagle-core/eagle-alert/alert/alert-devtools/bin/start-integration2.sh
        eagle-core/eagle-alert/alert/alert-devtools/bin/start-sampleclient1.sh
        eagle-core/eagle-alert/alert/alert-devtools/bin/start-sampleclient2.sh
        eagle-core/eagle-alert/alert/alert-devtools/pom.xml
        
eagle-core/eagle-alert/alert/alert-devtools/src/test/resources/kafka-offset-test.application.conf
        eagle-core/eagle-alert/alert/alert-engine/alert-engine-base/pom.xml
        
eagle-core/eagle-alert/alert/alert-engine/alert-engine-base/src/main/java/org/apache/eagle/alert/engine/Collector.java
        
eagle-core/eagle-alert/alert/alert-engine/alert-engine-base/src/main/java/org/apache/eagle/alert/engine/StreamContextImpl.java
        
eagle-core/eagle-alert/alert/alert-engine/alert-engine-base/src/main/java/org/apache/eagle/alert/engine/serialization/impl/StreamEventSerializer.java
        
eagle-core/eagle-alert/alert/alert-engine/alert-engine-base/src/main/java/org/apache/eagle/alert/engine/serialization/impl/StreamPartitionDigestSerializer.java
        
eagle-core/eagle-alert/alert/alert-engine/alert-engine-base/src/main/java/org/apache/eagle/alert/engine/serialization/impl/StreamPartitionSerializer.java
        
eagle-core/eagle-alert/alert/alert-engine/alert-engine-base/src/main/java/org/apache/eagle/alert/engine/utils/SerializableUtils.java
        
eagle-core/eagle-alert/alert/alert-engine/alert-engine-base/src/main/java/storm/kafka/KafkaSpoutMetric.java
        
eagle-core/eagle-alert/alert/alert-engine/alert-engine-base/src/test/java/org/apache/eagle/alert/engine/evaluator/AlertBoltOutputCollectorThreadSafeWrapperTest.java
        
eagle-core/eagle-alert/alert/alert-engine/alert-engine-base/src/test/java/org/apache/eagle/alert/engine/perf/TestSerDeserPer.java
        
eagle-core/eagle-alert/alert/alert-engine/alert-engine-base/src/test/java/org/apache/eagle/alert/engine/sorter/TreeMultisetComparatorTest.java
        
eagle-core/eagle-alert/alert/alert-metadata-parent/alert-metadata-service/src/main/resources/application.conf
        
eagle-core/eagle-alert/alert/alert-metadata-parent/alert-metadata/src/main/resources/application.conf
        
eagle-core/eagle-alert/alert/alert-metadata-parent/alert-metadata/src/test/resources/application-mongo.conf

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---

Reply via email to