GitHub user smoreau opened a pull request:

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

    Use the method parseMillis

    

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

    $ git pull https://github.com/smoreau/flume patch-1

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

    https://github.com/apache/flume/pull/2.patch

----
commit 3cac43e59f693fd1cc46c3a9df3ea00ec9858232
Author: Juhani Connolly <[EMAIL PROTECTED]>
Date:   2012-08-15T06:44:14Z

    FLUME-1382: Flume adopt message from existing local Scribe
    
    Implementation of ScribeSource allowing flume to receive messages from scribe, or any other agent using the thrift/scribe protocol
    (Danny Ye via Juhani Connolly)

commit ca636a3277cd9fd2a8d6df693b2c76c95acde984
Author: Will McQueen <[EMAIL PROTECTED]>
Date:   2012-08-17T22:19:23Z

    FLUME-1490. Option to limit number of events sent in Stress source.
    
    (Patrick Wendell via Will McQueen)

commit cf3c16f4b08663d408f01506015e1cf5be6c3d73
Author: Brock Noland <[EMAIL PROTECTED]>
Date:   2012-08-21T14:34:22Z

    FLUME-1437: Checkpoint can miss pending takes
    
    (Hari Shreedharan via Brock Noland)

commit 29b62f33b3403a8c680b1db7d9733bb4c5175e90
Author: Hari Shreedharan <[EMAIL PROTECTED]>
Date:   2012-08-21T20:58:38Z

    FLUME-1498. File channel log updates and queue updates should be atomic.
    
    (Brock Noland via Hari Shreedharan)

commit 4f42f04f42088f417d42aceb7dab25e864fd5b6b
Author: Brock Noland <[EMAIL PROTECTED]>
Date:   2012-08-22T18:19:54Z

    FLUME-1504: Test file channel times out randomly
    
    (Hari Shreedharan via Brock Noland)

commit ab7ccae3253e23cb209d1527ba2a7c7b3d9fcb39
Author: Hari Shreedharan <[EMAIL PROTECTED]>
Date:   2012-08-22T20:16:22Z

    FLUME-1505. TestFileChannel needs to be able to force a checkpoint.
    
    (Brock Noland via Hari Shreedharan)

commit c2367713ee9d6a4b88483bedf955ea6028f77206
Author: Hari Shreedharan <[EMAIL PROTECTED]>
Date:   2012-08-23T06:16:54Z

    FLUME-1489. Flume Scribe Source should be included in source and dist tarballs.
    
    (Juhani Connolly via Hari Shreedharan)

commit d80a7d6830c3143b2b400da4ace15da739de7221
Author: Mike Percy <[EMAIL PROTECTED]>
Date:   2012-08-23T08:20:35Z

    FLUME-1492. Create integration test for file channel.
    
    (Will McQueen via Mike Percy)

commit e46cf8050acf1624d939d6029326ffae9e9d430a
Author: Hari Shreedharan <[EMAIL PROTECTED]>
Date:   2012-08-23T18:26:42Z

    FLUME-1508. TestFileChannel times out maven periodically.
    
    (Brock Noland via Hari Shreedharan)

commit c8895dd874b1e02efa8a28a24453cef73efa2fa3
Author: Mubarak Seyed <[EMAIL PROTECTED]>
Date:   2012-08-24T00:51:56Z

    FLUME-1500 Upgrade flume to use latest version of Avro - v1.7
    
    (Hari Shreedharan via Mubarak Seyed)

commit ede734b4d9dc7eb6709844693f73adaf3e4b1120
Author: Brock Noland <[EMAIL PROTECTED]>
Date:   2012-08-24T14:35:00Z

    FLUME-1512: File Channel should not stop during a checkpoint
    
    (Hari Shreedharan via Brock Noland)

commit 40af97b9b6892fe24a59a76100879b0ab6258550
Author: Brock Noland <[EMAIL PROTECTED]>
Date:   2012-08-24T20:57:36Z

    FLUME-1428: File Channel should not consider a file as inactive until all takes are committed
    
    (Hari Shreedharan via Brock Noland)

commit f5f199f38cffc7b4b6672a7242f46dde010eb07c
Author: Brock Noland <[EMAIL PROTECTED]>
Date:   2012-08-27T18:50:27Z

    FLUME-1513: File Channel log close() method should not be synchronized
    
    (Hari Shreedharan via Brock Noland)

commit 81effe2e3e1e6741d468c9de949e8e0329e90131
Author: Hari Shreedharan <[EMAIL PROTECTED]>
Date:   2012-08-29T22:08:47Z

    FLUME-1524. Fix flaky MonitoredCounterGroup test.
    
    (Mike Percy via Hari Shreedharan)

commit 1e3599a9fab62b61a0abcade67fa7328240b83b4
Author: Hari Shreedharan <[EMAIL PROTECTED]>
Date:   2012-08-29T22:17:36Z

    FLUME-1523. Allow -X java opts to be passed to the agent on the command line.
    
    (Mike Percy via Hari Shreedharan)

commit e8740532ecf4eb818621cdd11c0cc2c5aecd7906
Author: Hari Shreedharan <[EMAIL PROTECTED]>
Date:   2012-08-30T16:33:43Z

    FLUME-1525. Increase test timeouts.
    
    (Brock Noland via Hari Shreedharan)

commit fc282f7ea44839437fc34a026d8fb7e59d53466d
Author: Brock Noland <[EMAIL PROTECTED]>
Date:   2012-08-30T16:48:53Z

    FLUME-1496: TestFileChannel is bloated
    
    (Hari Shreedharan via Brock Noland)

commit 52f67c2dad6598faced14dba4c98bfae7b291714
Author: Hari Shreedharan <[EMAIL PROTECTED]>
Date:   2012-08-30T21:48:58Z

    FLUME-1527. Seed TransactionID/WriteOrderID in the case no logs need to be replayed.
    
    (Brock Noland via Hari Shreedharan)

commit 5673e06086c535dd6606f313b68a28f46796db3d
Author: Brock Noland <[EMAIL PROTECTED]>
Date:   2012-08-31T16:19:57Z

    FLUME-1528: File Channel replay when no checkpoint is present can be faster
    
    (Hari Shreedharan via Brock Noland)

commit 43f04894654925e0a5472ac99d3cde689545a61d
Author: Hari Shreedharan <[EMAIL PROTECTED]>
Date:   2012-08-31T19:50:04Z

    FLUME-1531. Flume User Guide should provide more details on configuring the timestamp interceptor.
    
    (Kathleen Ting via Hari Shreedharan)

commit a4763a7d7367f6d639567315a486675d20794ad5
Author: Will McQueen <[EMAIL PROTECTED]>
Date:   2012-08-31T22:34:33Z

    FLUME-1532. Increase test timeouts even further.
    
    (Hari Shreedharan via Will McQueen)

commit 6b8c8d70b773535e9815b6323e9b0bcbdf82ccd1
Author: Will McQueen <[EMAIL PROTECTED]>
Date:   2012-09-02T22:30:21Z

    FLUME-1534. CheckpointRebuilder$ComparableFlumeEventPointer#equal does
    not work correctly.
    
    (Hari Shreedharan via Will McQueen)

commit c8a93e4a588cc226bfbc803faead11eec2741364
Author: Jarek Jarcec Cecho <[EMAIL PROTECTED]>
Date:   2012-09-03T06:20:46Z

    FLUME-1507. Have "Topology Design Considerations" in User Guide.
    
    (Patrick Wendell via Jarek