Re: Can't merge master into 3.0

[Scott Blum]

Actually, it's not a problem with the changes I'm trying to merge in;
TestTreeCache is currently broken on 3.0 branch already.

Looks like it broke on revision c6a22ba508f9227fe1c657f93e3cc77d8bc17e3e,
which was a merge from master into 3.0, with some conflict resolution.

On Mon, Feb 1, 2016 at 2:46 PM, Jordan Zimmerman <jor...@jordanzimmerman.com
> wrote:

> I can try to merge when I get a chance. At some point, we should move
> CURATOR-3.0 to master so we don’t have to keep maintaining this.
>
> -JZ
>
> On Feb 1, 2016, at 2:38 PM, Scott Blum <dragonsi...@gmail.com> wrote:
>
> TestTreeCache fails on 6acf0987125469ecb79ff48ce5e9735a98cd1abb
> <http://git-wip-us.apache.org/repos/asf/curator/commit/6acf0987>, a
> proposed merge of master into 3.0.
>
> It has something to do with the new watcher stuff, but I haven't been able
> to figure out what the problem is, possible because I don't understand the
> new stuff well enough.  Any ideas?
>
>
>