couchdb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Noah Slater <nsla...@apache.org>
Subject Re: Merging the fauxton branch into master
Date Thu, 21 Mar 2013 17:36:11 GMT
Please also make sure NOTICE is updated appropriately.


On 19 March 2013 04:37, Russell Branca <chewbranca@gmail.com> wrote:

> On Mon, Mar 18, 2013 at 6:25 PM, Ryan Ramage <ryan.ramage@gmail.com>
> wrote:
>
> > > Oh, one more little merge blocker, we should get the build working in
> the
> > > fauxton branch before bringing it into master. One of the tasks is not
> > > falling back to using settings.json.default and is blowing up the
> build,
> > > will be a simple fix.
> > >
> > >
> > > -Russell
> > >
> >
> >
> > I think I fixed it here.
> >
> >
> https://git-wip-us.apache.org/repos/asf?p=couchdb.git;a=commit;h=57164b918f2fe8635201e37dcf5e5a3485eab50b
> >
>
> Might be a slightly different issue, but the build is still failing and it
> looks json file related:
> https://travis-ci.org/apache/couchdb/builds/5612908
>
>
> -Russell
>



-- 
NS

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message