Rohit, You are quite right to complain about this, as in +1. There was a similar thing in the 44to45 files between 4.5 and master. Hugo mailed about it and half of it got resolved! WTF indeed.
mobile dev with bilingual spelling checker used (read at your own risk) Op 1 dec. 2014 09:18 schreef "Rohit Yadav" <rohit.ya...@shapeblue.com>: > Hi, > > While I’m working to backport changes on 4.3 branch, I discovered some > changes between 4.3 branch’s schema-421to431.sql and master branch’s > 421to431.sql files. While most changes are inserts/update related which may > not severely harm a user upgrading from a previous version of CloudStack, > but I found there were changes in the schema itself; in this case the > `cloud`.`template_view`: > > 0e2e6995 setup/db/db/schema-421to430.sql (Nitin Mehta 2014-01-30 > 17:59:55 -0800 306) `cloud`.`template_store_ref` ON > template_store_ref.template_id = vm_template.id and > template_store_ref.store_role = 'Image' and template_store_ref.destroyed=0 > > While on 4.3 branch: > abbae2aa setup/db/db/schema-420to430.sql (Alex Huang 2013-08-26 > 17:30:58 -0700 306) `cloud`.`template_store_ref` ON > template_store_ref.template_id = vm_template.id and > template_store_ref.store_role = ‘Image’ > > > Which version should we keep? Here’s the complete diff: > http://pastebin.com/PB6N7aCt > > You may do it locally against 4.3 (4.4/4.5 etc.) and master as well: > git diff master 4.3 -- setup/db/db/schema-421to430.sql > > I think such issues are seen time and time again due to the way paid > contributors work on private forks and upstream ACS. We simply don’t want > to use code thrown over corporate fences to ACS branches. > > While who am I to tell you how to do your job - I simply request that all > of the committers are expected to have some level of commitment to the > project and ethics of their contributions. The best way to work together is > to work in the upstream first and then work on your forks that is based on > the upstream. Hope this will improve with time. > > Regards, > Rohit Yadav > Software Architect, ShapeBlue > M. +91 88 262 30892 | rohit.ya...@shapeblue.com > Blog: bhaisaab.org | Twitter: @_bhaisaab > > Find out more about ShapeBlue and our range of CloudStack related services > > IaaS Cloud Design & Build< > http://shapeblue.com/iaas-cloud-design-and-build//> > CSForge – rapid IaaS deployment framework<http://shapeblue.com/csforge/> > CloudStack Consulting<http://shapeblue.com/cloudstack-consultancy/> > CloudStack Software Engineering< > http://shapeblue.com/cloudstack-software-engineering/> > CloudStack Infrastructure Support< > http://shapeblue.com/cloudstack-infrastructure-support/> > CloudStack Bootcamp Training Courses< > http://shapeblue.com/cloudstack-training/> > > This email and any attachments to it may be confidential and are intended > solely for the use of the individual to whom it is addressed. Any views or > opinions expressed are solely those of the author and do not necessarily > represent those of Shape Blue Ltd or related companies. If you are not the > intended recipient of this email, you must neither take any action based > upon its contents, nor copy or show it to anyone. Please contact the sender > if you believe you have received this email in error. Shape Blue Ltd is a > company incorporated in England & Wales. ShapeBlue Services India LLP is a > company incorporated in India and is operated under license from Shape Blue > Ltd. Shape Blue Brasil Consultoria Ltda is a company incorporated in Brasil > and is operated under license from Shape Blue Ltd. ShapeBlue SA Pty Ltd is > a company registered by The Republic of South Africa and is traded under > license from Shape Blue Ltd. ShapeBlue is a registered trademark. >
