GitHub user weststorm opened a pull request:

    https://github.com/apache/flume/pull/46

    Trunk

    (Jeff Holoman via Jarek Jarcec Cecho)

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

    $ git pull https://github.com/apache/flume trunk

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

    https://github.com/apache/flume/pull/46.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 #46
    
----
commit c9ddf93701e16a93f3b69355bc56545effdc7230
Author: Hari Shreedharan <hshreedha...@apache.org>
Date:   2013-10-12T04:26:40Z

    FLUME-2212. Upgrade to Morphlines-0.8.0
    
    (Wolfgang Hoschek via Hari Shreedharan)

commit 68fe4d45123473adbef1077c5de20b4dd48d3a1d
Author: Hari Shreedharan <hshreedha...@apache.org>
Date:   2013-10-14T22:56:54Z

    FLUME-2159. Remove TestNettyAvroRpcClient.spinThreadsCrazily.
    
    (Roshan Naik via Hari Shreedharan)

commit c420fad5d03dc8d17dce7fe3e59bf3b742f3d22d
Author: Hari Shreedharan <hshreedha...@apache.org>
Date:   2013-10-16T21:24:13Z

    FLUME-2213. MorphlineInterceptor should share metric registry across 
threads for better (aggregate) reporting
    
    (Wolfgang Hoschek via Hari Shreedharan)

commit 8db5de8f85f79d91818f85a241faec5d8eee9b54
Author: Roshan Naik <ros...@hortonworks.com>
Date:   2013-10-21T19:06:51Z

    FLUME-2064: Typo/Grammar in flume main user doc under Scribe
    
    (Ashish Paliwal via Roshan Naik)

commit 730c822c8fd3c393558ee63b48c82bb5a0763266
Author: Mike Percy <mpe...@cloudera.com>
Date:   2013-10-21T19:04:22Z

    FLUME-1666. Oops, forgot new test in previous commit

commit 603bcf2d0ef0d68357d0d40e34484fbdb96aa3f9
Author: Hari Shreedharan <hshreedha...@apache.org>
Date:   2013-10-25T00:47:53Z

    FLUME-2210. UnresolvedAddressException when using multiple hostNames in 
Elasticsearch sink configuration
    
    (Dib Ghosh via Hari Shreedharan)

commit f017ce5aca00d280ad6ee94e63fe3b44c326c5cf
Author: Hari Shreedharan <hshreedha...@apache.org>
Date:   2013-10-25T05:18:37Z

    FLUME-2192. AbstractSinkProcessor stop incorrectly calls start
    
    (Jeremy Karlson via Hari Shreedharan)

commit 3cc8cec0ec37e6575efdbe3badcc28eceee017c0
Author: Hari Shreedharan <hshreedha...@apache.org>
Date:   2013-10-31T01:30:49Z

    FLUME-1851. Fix grammatical error in Flume User Guide.
    
    (Ashish Paliwal via Hari Shreedharan)

commit 6dfe63cdcebaa5f8091b4789f4df5f679ccb3596
Author: Hari Shreedharan <hshreedha...@apache.org>
Date:   2013-10-31T06:13:09Z

    FLUME-2206. ElasticSearchSink ttl field modification to mimic Elasticsearch 
way of specifying TTL
    
    (Dib Ghosh via Hari Shreedharan)

commit a89897bec4e7d6f3342ed966c61668e8a8139af5
Author: Jarek Jarcec Cecho <jar...@apache.org>
Date:   2013-10-31T19:54:10Z

    FLUME-2229. Backoff period gets reset too often in OrderSelector
    
    (Hari Shreedharan via Jarek Jarcec Cecho)

commit e026545183f577d21850162257152ba38a3f6f9f
Author: Roshan Naik <ros...@hortonworks.com>
Date:   2013-11-07T03:30:42Z

    FLUME-2065. Regex Extractor Interceptor config agent name inconsistent with 
rest of docs
    
    (Ashish Paliwal via Roshan Naik)

commit d3f5123c4d6cdbe4e5cca6e7e141e507bb1103a7
Author: Roshan Naik <ros...@hortonworks.com>
Date:   2013-11-07T19:42:05Z

    FLUME-2233. MemoryChannel lock contention on every put due to 
bytesRemaining Semaphore
    
    (Hari Shreedharan via Roshan Naik)

commit e27ae5fdce48100a85e353f97ed8a150afe5a4aa
Author: Roshan Naik <ros...@hortonworks.com>
Date:   2013-11-07T21:07:24Z

    FLUME-2231. Add details in Flume Ganglia config in User Guide
    
    (Ashish Paliwal via Roshan Naik)

commit 705abaf00fbf8ee69ac88cbccae47c1a33f4b4b2
Author: Jarek Jarcec Cecho <jar...@apache.org>
Date:   2013-11-07T22:53:04Z

    FLUME-2235. idleFuture should be cancelled at the start of append
    
    (Hari Shreedharan via Jarek Jarcec Cecho)

commit c23448fc959844eece5a8ab2dbf091c2c4973a26
Author: Mike Percy <mpe...@cloudera.com>
Date:   2013-12-05T20:58:03Z

    FLUME-2255. Correctly handle ChannelExceptions in SpoolingDirectorySource
    
    (Hari Shreedharan via Mike Percy)

commit 2ea4922025e6db25d8627b522146b8b29c40a62b
Author: Hari Shreedharan <hshreedha...@apache.org>
Date:   2013-12-09T23:12:47Z

    FLUME-2262. Log4j Appender should use timeStamp field not getTimestamp, 
which was not available in older log4j versions.
    
    (Brock Noland via Hari Shreedharan)

commit 753e4137918b5bdf559dd50a21db2a832aa1dce3
Author: Hari Shreedharan <hshreedha...@apache.org>
Date:   2013-12-10T00:35:33Z

    FLUME-2238. Provide option to configure worker threads in NettyAvroRpcClient
    
    (Cameron Gandevia via Hari Shreedharan)

commit 67454a71a3aba308ff0d1b29ad3f184e5c37fee2
Author: Hari Shreedharan <hshreedha...@apache.org>
Date:   2013-12-10T04:02:01Z

    FLUME-2209. AsyncHBaseSink will never recover if the column family does not 
exists for the first start.
    
    (Ashish Paliwal via Hari Shreedharan)

commit 9790ca7587060285efa4ae64591cea17dd3f00cf
Author: Mike Percy <mpe...@cloudera.com>
Date:   2013-12-10T22:38:06Z

    FLUME-2217. Add option to preserve all Syslog headers in syslog sources
    
    (Jeff Lord via Mike Percy)

commit d76118d729d2fe0888b934b0dc743f5f068f63dd
Author: Hari Shreedharan <hshreedha...@apache.org>
Date:   2013-12-12T23:11:00Z

    FLUME-2266. Update Morphline Sink to kite-0.10.0.
    
    (Wolfgang Hoschek via Hari Shreedharan)

commit 6373032a620bdc687b6d03b12726713d08c71a10
Author: Hari Shreedharan <hshreedha...@apache.org>
Date:   2013-12-13T20:35:43Z

    FLUME-2155. Index the Flume Event Queue during replay to improve replay 
time.
    
    (Brock Noland via Hari Shreedharan)

commit 58f3f6fb18e18fbf67fbd1ae0044c337845eba8d
Author: Hari Shreedharan <hshreedha...@apache.org>
Date:   2013-12-13T21:23:29Z

    FLUME-1679. Add dependency on Guava to flume-ng-elasticsearch-sink POM
    
    (Andrew Purtell via Hari Shreedharan)

commit 79dc97bddbf6602c5f375337b3261f33d5555775
Author: Hari Shreedharan <hshreedha...@apache.org>
Date:   2013-12-13T22:14:57Z

    FLUME-2264. Log4j Appender + Avro Reflection on string results in an 
invalid avro schema
    
    (Brock Noland via Hari Shreedharan)

commit 90bb15383c9a6d0b376c3ff5c83adade5092f8c4
Author: Hari Shreedharan <hshreedha...@apache.org>
Date:   2013-12-13T22:47:27Z

    FLUME-2239. Clarify File Channel's dataDirs setting in User Guide
    
    (Roshan Naik via Hari Shreedharan)

commit 0d04373473e302a3155b12945e3350cee760c151
Author: Mike Percy <mpe...@cloudera.com>
Date:   2013-12-14T08:51:57Z

    FLUME-2267. Increase default transactionCapacity for FileChannel from 1000 
to 10000
    
    (Udai Kiran Potluri via Mike Percy)

commit 72b3b7889f1dcf6736f099b77c878efe891c6585
Author: Mike Percy <mpe...@cloudera.com>
Date:   2013-12-16T22:59:14Z

    FLUME-2056. Allow SpoolDir to pass just the filename that is the source of 
an event
    
    (Jeff Lord via Mike Percy)

commit c10c7beced9cb39a675e82f6d86e8cd5b84485c9
Author: Hari Shreedharan <hshreedha...@apache.org>
Date:   2013-12-17T22:57:56Z

    FLUME-2270. Fix Twitter Source documentation.
    
    (Jeff Lord via Hari Shreedharan)

commit 8acd54bb1089cc7b620dfd0c9ef9c828de1cc89c
Author: Roshan Naik <ros...@hortonworks.com>
Date:   2013-12-20T09:44:21Z

    FLUME-2278. Incorrect documentation for write-timeout of File Channel
    
    (Satoshi Iijima via Roshan Naik)

commit 3b1034e8229eb9ad3e27ed0faab77c3f68f708c6
Author: Jarek Jarcec Cecho <jar...@apache.org>
Date:   2013-12-23T12:41:29Z

    FLUME-2265. Closed bucket writers should be removed from sfwriters map
    
    (Hari Shreedharan via Jarek Jarcec Cecho)

commit c3a9c80ab431f6ba670142c7ce6813692422f764
Author: Hari Shreedharan <hshreedha...@apache.org>
Date:   2014-01-03T02:22:31Z

    FLUME-2275. Improve scalability of MorphlineInterceptor under contention
    
    (Wolfgang Hoschek via Hari Shreedharan)

----


---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

Reply via email to