hadoop-yarn-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Carlo Curino <ccur...@microsoft.com>
Subject Merge commit pushed to trunk... should we fix it? should it happen?
Date Wed, 10 Feb 2016 18:41:17 GMT
Hi Guys,

I have a question, I mistakenly do git pull (instead of git pull -rebase), and thus I had
a Merge patch entry,
which got pushed to trunk. I was under the impression (and so was Arun Suresh and Chris Douglas)
that this
should not be possible.  (git log -graph shown below).

Now I have two questions:

1)     Shall I try to fix it? And how do you think this should be done to keep things clean.

2)     Should we try to make the infrastructure reject this type of things?

Thanks and sorry for this,
Carlo



*   commit c3641ed3b183fa46e6b042fd19c1a373b8f95d33
|\  Merge: b706cbc bc425a6
| | Author: = <curino@apache.org>
| | Date:   Wed Feb 10 10:24:18 2016 -0800
| |
| |     Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/hadoop into trunk
| |
| * commit bc425a623fd06c4f56106fb2ea662b19e4434d11
| | Author: Karthik Kambatla <kasha@apache.org>
| | Date:   Wed Feb 10 10:08:05 2016 -0800
| |
| |     HDFS-9637. Tests for RollingFileSystemSink. (Daniel Templeton via kasha)
| |
* | commit b706cbc1bc0ab3572c01676fe7365df21eda7ffa
|/  Author: = <curino@apache.org>
|   Date:   Wed Feb 10 10:19:26 2016 -0800
|
|       YARN-4420. Add REST API for List Reservations (Sean Po via curino)
|
* commit 4ef1324ff66fe6c5ffbb828143e231fcafb143a9
| Author: Zhe Zhang <zhz@apache.org>
| Date:   Wed Feb 10 09:56:40 2016 -0800
|
|     HADOOP-12764. Increase default value of KMX maxHttpHeaderSize and make it configurable.
|
|     Change-Id: I6e970563c201152e1428feafb8124e61c15a6fc0

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message