Conflict while trying to merge groups with plugins

[Luca Milanesio]

Hi Colbi and Shawn,

trying to rebasing groups on top of latest plugins merged branch I've encountered one conflict that I need you to see and resolve together.

Class: PerThreadRequestScope

Shawn's changes:

commit 45395d825aa89dbd303d40ad8595825638c80cd8

Author: Shawn O. Pearce <s...@google.com>

Date:   Thu May 10 19:12:09 2012 -0700

    Move replication logic to replication plugin

    

    This splits all of the replication code out of the core server and

    moves it into a standard plugin. A new listener API is used inside of

    the core server to notify interested plugins of any Git reference

    changes, which the replication code can hook into to schedule its

    events.

    

    Change-Id: I77ee4440a009c2ce1c62fb6a445c7e3c912245f9

Colby's changes:

commit be84200ae05507718a16eddb6be00847f013188a

Author: Colby Ranger <cra...@google.com>

Date:   Wed May 9 10:39:48 2012 -0700

    Update the ThreadLocal based scopes to use RequestContext.

    

    Bound the ThreadLocalRequestContext module, which makes the CurrentUser

    available in the Global module. Removed any binding in the scopes that

    provided the CurrentUser. Updated all of the scopes to propagate the

    RequestContext. The PerThreadRequestScope.Propagator allows scoping

    callables to enter a request context.

    

    Change-Id: Idf682ed1d7485cf8c9cdd22cd89bfe1ad5296880

Once this has been clarified and resolved, I can move on and make some further plugins experiments on groups :-)

Luca.

[Colby Ranger]

Thanks Luca. Shawn and I will sort out this conflict today.

-Colby

[Colby Ranger]

I rebased on top of Shawn's changes and resolved all the conflicts yesterday.

-Colby

[Luca Milanesio]

Excellent, will start working on top of your latest patch.

Luca.