Home | About | Sematext search-lucene.com search-hadoop.com
 Search Hadoop and all its subprojects:

Switch to Threaded View
Flume, mail # dev - Re: [5/10] git commit: Merge branch 'trunk' of git://git.apache.org/flume into new-trunk


Copy link to this message
-
Re: [5/10] git commit: Merge branch 'trunk' of git://git.apache.org/flume into new-trunk
Hari Shreedharan 2012-08-15, 07:08
Juhani,

I am not sure why you pushed a bunch of merge commits to trunk. Trunk in general should be kept linear. We should not have merge commits on trunk - all commits should be done only after a rebase on the committer's side. I am going to check with Jukka if we can rollback trunk to a pre-merge commit state. Once that is done, can you push only the commits which you intended to push?

Thanks
Hari

--
Hari Shreedharan
On Wednesday, August 15, 2012 at 12:00 AM, [EMAIL PROTECTED] wrote:

> Merge branch 'trunk' of git://git.apache.org/flume (http://git.apache.org/flume) into new-trunk
>
>
> Project: http://git-wip-us.apache.org/repos/asf/flume/repo
> Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/73e5364b
> Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/73e5364b
> Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/73e5364b
>
> Branch: refs/heads/trunk
> Commit: 73e5364b6683a5bbc4b1b93c5fab30be6ac66cc7
> Parents: 24f2d38 eaee422
> Author: Juhani Connolly <[EMAIL PROTECTED] (mailto:[EMAIL PROTECTED])>
> Authored: Fri Aug 3 15:57:10 2012 +0900
> Committer: Juhani Connolly <[EMAIL PROTECTED] (mailto:[EMAIL PROTECTED])>
> Committed: Fri Aug 3 15:57:10 2012 +0900
>
> ----------------------------------------------------------------------
> flume-ng-channels/flume-file-channel/pom.xml | 5 +
> .../org/apache/flume/conf/FlumeConfiguration.java | 14 +-
> .../org/apache/flume/channel/ChannelProcessor.java | 5 +
> .../flume/instrumentation/GangliaServer.java | 73 ++--
> .../flume/lifecycle/LifecycleSupervisor.java | 148 ++++----
> .../apache/flume/source/PollableSourceRunner.java | 2 +
> .../java/org/apache/flume/tools/VersionInfo.java | 15 +-
> flume-ng-doc/sphinx/FlumeUserGuide.rst | 26 +-
> .../file/AbstractFileConfigurationProvider.java | 3 +
> .../org/apache/flume/sink/hdfs/BucketWriter.java | 10 +-
> .../org/apache/flume/sink/hdfs/HDFSEventSink.java | 1 -
> .../apache/flume/sink/hdfs/HDFSSequenceFile.java | 2 +-
> .../apache/flume/sink/hbase/AsyncHBaseSink.java | 274 +++++++++------
> .../hbase/HBaseSinkConfigurationConstants.java | 3 +
> pom.xml | 6 +
> 15 files changed, 355 insertions(+), 232 deletions(-)
> ----------------------------------------------------------------------