Updated BIGTOP-2467.patch #37

Merged
merged 1 commit into from Aug 17, 2016

Conversation

Projects
None yet
2 participants

petevg commented Aug 4, 2016

Got merged upstream, so we could get rid of it in the "master"
directory. Updated the patch in the 1.1 directory, so that it contains
my backwards compatible changes.

@juju-solutions/bigdata

resources/bigtop-1.1.0/BIGTOP-2467.patch
++ <% @ensemble.each_with_index do |server,idx| %>
++server.<%= idx %>=<%= server %>
++ <% end %>
+ <% end %>
@petevg

petevg Aug 4, 2016

I had github generate the patch this time, rather than using "git format-patch", which seems to mean that everything is registering as new. Line 103-110 are the only real differences between this and the existing patch, though.

petevg commented Aug 4, 2016

Zookeeper tests pass, with the updated patch, running with the latest juju beta against LXD containers.

Owner

johnsca commented Aug 9, 2016

I think the large diff is due to the difference between the squashed merge vs the multiple commits. Perhaps we could use https://github.com/apache/bigtop/commit/87e7d01da2558347f9ea64983506d9d8d944a4b2.patch as the source instead, as that's what actually got in upstream?

Also, apache/bigtop#116 should probably be closed.

Updated BIGTOP-2467.patch
Got merged upstream, so we could get rid of it in the "master"
directory. Updated the patch in the 1.1 directory, so that it contains
my backwards compatible changes.
Owner

johnsca commented Aug 17, 2016

👍

@johnsca johnsca merged commit 6e462b8 into master Aug 17, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment