After the sync ignite-2.0 will merge my commit and the other commit, that removed extra spark version, from the master and everything should be resolved after that.
— Denis > On Mar 10, 2017, at 12:32 PM, Vyacheslav Daradur <daradu...@gmail.com> wrote: > > > I'm talking about: > > - master-branch had 2 dublicated properties [<hadoop.version>, > <spring.version>] (your commit fix it > <https://github.com/apache/ignite/commit/e6703518f4549a183993a5422fbf75b18f1237de>) > - ignite-2.0 branch has 3 dublicated properties [<hadoop.version>, > <spring.version>, <spark.version>] > > After branch synchronization, ignite-2.0 branch will has one more dublicated > property [<spark.version>]. > > Am I missing something here? > > > 2017-03-10 23:16 GMT+03:00 Denis Magda <dma...@apache.org > <mailto:dma...@apache.org>>: > The commit will be merged to ignite-2.0 the next time when the branches will > be put in sync. > > — > Denis > >> On Mar 10, 2017, at 12:06 PM, Vyacheslav Daradur <daradu...@gmail.com >> <mailto:daradu...@gmail.com>> wrote: >> >> Denis, thanks. >> >> I've seen your commit in the master-branch. >> >> Notice, the ignite-2.0 branch contains one more duplicated property: >> "<spark.version>1.5.2</spark.version>". >> >> -- >> Best regards. >> >> 2017-03-10 22:37 GMT+03:00 Denis Magda <dma...@apache.org >> <mailto:dma...@apache.org>>: >> Hi, >> >> Thanks a lot, I’ve merged your changes. >> >> — >> Denis >> >> > On Mar 9, 2017, at 11:27 PM, Vyacheslav Daradur <daradu...@gmail.com >> > <mailto:daradu...@gmail.com>> wrote: >> > >> > Hello everyone. >> > >> > Please review changes. https://issues.apache.org/jira/browse/IGNITE-4804 >> > <https://issues.apache.org/jira/browse/IGNITE-4804> >> > >> > I found this mistake when I worked on an another issue. >> > I created new issue (ignite-4804), because reviewer told me I should fix >> > this in different task, because it didn't relates to that issue.
