Re: [svn] Merge all changes done in one module to branch

2014-10-30 Thread Davide Giannella
On 29/10/2014 14:24, Chetan Mehrotra wrote: > Hi Team, > > I need to merge all changes done in oak-lucene so far to > branches/1.0/oak-lucene. Is it possible to do via direct command (kind > of [1]) or I would need to figure out all revisions done in oak-lucene > and specify them explicilty with sv

Re: Oak 1.1.2 release

2014-10-30 Thread Davide Giannella
On 24/10/2014 08:29, Davide Giannella wrote: > Good morning team, > > I'm planning to cut the next unstable release next monday PM. > > There are some unresolved issues. Update where needed and if you need > extra time for resolving just let me know. > > https://issues.apache.org/jira/issues/?jql=p

Re: [svn] Merge all changes done in one module to branch

2014-10-30 Thread Marcel Reutegger
Hi, I think merging explicit revisions is the only clean solution. it is quite a bit of work, but makes sure we have the mergeinfo tracked. Regards Marcel On 30/10/14 09:35, "Davide Giannella" wrote: >On 29/10/2014 14:24, Chetan Mehrotra wrote: >> Hi Team, >> >> I need to merge all changes do

Re: [svn] Merge all changes done in one module to branch

2014-10-30 Thread Chetan Mehrotra
On Thu, Oct 30, 2014 at 2:20 PM, Marcel Reutegger wrote: > I think merging explicit revisions is the only clean solution. > it is quite a bit of work, but makes sure we have the mergeinfo > tracked. Thats what I feared. Would do it the right (hard!) way then. Chetan Mehrotra

Re: svn commit: r1635058 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak: api/jmx/IndexStatsMBean.java plugins/index/AsyncIndexUpdate.java stats/RepositoryStats.java stats/

2014-10-30 Thread Amit Jain
Hi, >>Would it be an option to use the ScheduledExecutorService from org.apache.jackrabbit.oak.Oak? In revision 1635436, I removed the custom executor service and used whiteboard instance to schedule in org.apache.jackrabbit.oak.Oak. Thanks Amit On Wed, Oct 29, 2014 at 10:10 PM, Marcel Reutegge

Re: svn commit: r1635058 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak: api/jmx/IndexStatsMBean.java plugins/index/AsyncIndexUpdate.java stats/RepositoryStats.java stats/

2014-10-30 Thread Marcel Reutegger
looks good now. thanks for the fix. regards marcel On 30/10/14 10:12, "Amit Jain" wrote: >Hi, > >>>Would it be an option to use the ScheduledExecutorService from >org.apache.jackrabbit.oak.Oak? > >In revision 1635436, I removed the custom executor service and used >whiteboard instance to sched

Re: svn commit: r1635464 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/ oak-core/src/main/java/org/apache/jackrabbit/oak/spi/xml/ oak-jcr/src/main/java/org

2014-10-30 Thread Julian Reschke
On 2014-10-30 11:54, ang...@apache.org wrote: Author: angela Date: Thu Oct 30 10:54:37 2014 New Revision: 1635464 URL: http://svn.apache.org/r1635464 Log: OAK-2245 : UserImporter should always set the rep:authorizableID Added: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabb

Re: Oak 1.1.2 release

2014-10-30 Thread Davide Giannella
On 24/10/2014 08:29, Davide Giannella wrote: > Good morning team, > > I'm planning to cut the next unstable release next monday PM. > > There are some unresolved issues. Update where needed and if you need > extra time for resolving just let me know. > > https://issues.apache.org/jira/issues/?jql=p

Re: Oak 1.1.2 release

2014-10-30 Thread Angela Schreiber
hi davide i only see one open issue for 1.1.2: https://issues.apache.org/jira/browse/OAK-2198 and that one only has things commited to the trunk... is that one not yet completed? and if not, can't we postpone the fix to 1.1.3? kind regards angela On 30/10/14 16:25, "Davide Giannella" wrote: