OK thanks Jiajia. I recommend trying to get the merge finished as soon as possible so that everyone is working off the same branch.
Colm. On Fri, Feb 2, 2018 at 1:06 AM, Li, Jiajia <jiajia...@intel.com> wrote: > Hi Colm, > > Some users are using the "has-project" branch because we haven' t finished > the merging process in "master" branch, so we need to maintain the > "has-project" branch, and we will also commit these patches to "master" a > litter later. Users will use the Kerby release version after Kerby > finishing the merging process, we will speed up the progress, make the > Kerby 2.0 available as soon as possible. > > Thanks, > Jiajia > > -----Original Message----- > From: Colm O hEigeartaigh [mailto:cohei...@apache.org] > Sent: Thursday, February 1, 2018 5:40 PM > To: kerby@directory.apache.org > Subject: Re: directory-kerby git commit: Update hadoop patch for plugin > dependencies. > > Hi, > > I'm concerned at the way that we are committing both to the "has-project" > and "master" branches. It's inevitable that commits will get lost by doing > this. What are the reasons that we can't just merge to master, given that > the "has-project" is already there? > > Colm. > > On Thu, Feb 1, 2018 at 2:20 AM, <zengl...@apache.org> wrote: > > > Repository: directory-kerby > > Updated Branches: > > refs/heads/has-project 9e370a760 -> 88df20bc8 > > > > > > Update hadoop patch for plugin dependencies. > > > > > > Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo > > Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/ > > commit/88df20bc > > Tree: > > http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/88df20bc > > Diff: > > http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/88df20bc > > > > Branch: refs/heads/has-project > > Commit: 88df20bc853063291d646ad258183b0e4d3861b2 > > Parents: 9e370a7 > > Author: zenglinx <frank.z...@intel.com> > > Authored: Thu Feb 1 10:20:00 2018 +0800 > > Committer: zenglinx <frank.z...@intel.com> > > Committed: Thu Feb 1 10:20:00 2018 +0800 > > > > ---------------------------------------------------------------------- > > has/supports/hadoop/hadoop-2.7.2.patch | 10 ++++++++++ > > 1 file changed, 10 insertions(+) > > ---------------------------------------------------------------------- > > > > > > http://git-wip-us.apache.org/repos/asf/directory-kerby/ > > blob/88df20bc/has/supports/hadoop/hadoop-2.7.2.patch > > ---------------------------------------------------------------------- > > diff --git a/has/supports/hadoop/hadoop-2.7.2.patch > > b/has/supports/hadoop/hadoop-2.7.2.patch > > index 85c7c3f..c7597be 100644 > > --- a/has/supports/hadoop/hadoop-2.7.2.patch > > +++ b/has/supports/hadoop/hadoop-2.7.2.patch > > @@ -11,6 +11,16 @@ index aa3c2c7..e4f1fd2 100644 > > + <artifactId>has-client</artifactId> > > + <version>1.0.0-SNAPSHOT</version> > > + </dependency> > > ++ <dependency> > > ++ <groupId>org.drizzle.jdbc</groupId> > > ++ <artifactId>drizzle-jdbc</artifactId> > > ++ <version>1.4</version> > > ++ </dependency> > > ++ <dependency> > > ++ <groupId>org.apache.kerby</groupId> > > ++ <artifactId>has-plugins</artifactId> > > ++ <version>1.0.0-SNAPSHOT</version> > > ++ </dependency> > > </dependencies> > > > > <build> > > > > > > > -- > Colm O hEigeartaigh > > Talend Community Coder > http://coders.talend.com > -- Colm O hEigeartaigh Talend Community Coder http://coders.talend.com
