Opened 5 years ago

Closed 5 years ago

#18187 closed enhancement (fixed)

Move the planarity files to a spkg

Reported by: ncohen Owned by:
Priority: major Milestone: sage-6.7
Component: packages: standard Keywords:
Cc: mmezzarobba, vdelecroix, tmonteil, dcoudert, jdemeyer Merged in:
Authors: Nathann Cohen, Jeroen Demeyer Reviewers: Jeroen Demeyer, Nathann Cohen
Report Upstream: None of the above - read trac for reasoning. Work issues:
Branch: 2ebb2d1 (Commits) Commit: 2ebb2d1329f94876c2aeafc5fcad81a5af9f7364
Dependencies: #18431, #18428 Stopgaps:

Description (last modified by jdemeyer)

The contents of sage/graphs/planarity_c is not Sage source but a non-vanilla copy of John Boyer's planarity code [1]. This branch turns it into a standard package.

Package: http://boxen.math.washington.edu/home/jdemeyer/spkg/planarity-2.2.0.tar.bz2 (upstream version 2.2.0 - Nauty + edited version of Nathann Cohen's autotools project)

[1] https://code.google.com/p/planarity/

Change History (71)

comment:1 Changed 5 years ago by ncohen

  • Authors set to Nathann Cohen
  • Branch set to public/18187
  • Cc mmezzarobba vdelecroix tmonteil dcoudert jdemeyer added
  • Commit set to 4f8f33dce644b511d120a88b98e779476d895a53
  • Component changed from PLEASE CHANGE to packages: standard
  • Description modified (diff)
  • Status changed from new to needs_review
  • Type changed from PLEASE CHANGE to enhancement

New commits:

4f8f33dtrac #18187: Move the planarity files to a spkg

comment:2 follow-up: Changed 5 years ago by jdemeyer

  • Status changed from needs_review to needs_work

Is this meant to be a standard or optional package? In any case, the current branch obviously doesn't work if planarity is not installed:

$ make
...
building 'sage.graphs.planarity' extension
Executing 1 command (using 1 thread)
gcc -fno-strict-aliasing -g -O2 -DNDEBUG -g -fwrapv -O3 -Wall -fPIC -I/usr/local/src/sage-config/local/include -I/usr/local/src/sage-config/src -I/usr/local/src/sage-config/src/c_lib/include -I/usr/local/src/sage-config/src/sage/ext -I/usr/local/src/sage-config/local/include/python2.7 -c build/cythonized/sage/graphs/planarity.c -o build/temp.linux-x86_64-2.7/build/cythonized/sage/graphs/planarity.o -fno-strict-aliasing -w -fno-tree-dominator-opts
build/cythonized/sage/graphs/planarity.c:276:29: fatal error: planarity/graph.h: No such file or directory
 #include "planarity/graph.h"
                             ^
compilation terminated.
error: command 'gcc' failed with exit status 1
Makefile:19: recipe for target 'build' failed
make: *** [build] Error 1

Also: to be safe, you might want to rebase on top of #18145, especially if you make further changes to the build system.

comment:3 in reply to: ↑ 2 Changed 5 years ago by ncohen

Is this meant to be a standard or optional package?

A standard package. This code is already part of Sage.

Also: to be safe, you might want to rebase on top of #18145, especially if you make further changes to the build system.

Second time I have to rebase on top of that one :-P

Nathann

comment:4 follow-up: Changed 5 years ago by ncohen

  • Status changed from needs_work to needs_review

I just checked, and there are no conflicts with #18145 (trivial merge).

Nathann

comment:5 Changed 5 years ago by jdemeyer

  • Status changed from needs_review to needs_work
  • Work issues set to spkg is not built

comment:6 in reply to: ↑ 4 ; follow-up: Changed 5 years ago by jdemeyer

Replying to ncohen:

I just checked, and there are no conflicts with #18145 (trivial merge).

I know, that ticket is just prone to conflicts. But it's also an important ticket. I hope you like the new syntax for optional packages in #18145.

comment:7 in reply to: ↑ 6 Changed 5 years ago by ncohen

I know, that ticket is just prone to conflicts. But it's also an important ticket. I hope you like the new syntax for optional packages in #18145.

Yepyep, it's indeed much much cleaner!!

Nathann

comment:8 Changed 5 years ago by jdemeyer

  • Work issues changed from spkg is not built to spkg is not built, make it portable

When building a library in a portable way, you must use some program like libtool.

comment:9 Changed 5 years ago by jdemeyer

I wonder if you could not use install the .c and .h sources somewhere instead of building a library.

comment:10 follow-up: Changed 5 years ago by jdemeyer

Or move planarity not to a spkg but to src/ext/planarity.

comment:11 in reply to: ↑ 10 ; follow-up: Changed 5 years ago by ncohen

Or move planarity not to a spkg but to src/ext/planarity.

Hmmmm... I prefer the libtool way out. These files haven't been reviewed, so I do not think that they should be in our code directly.

comment:12 in reply to: ↑ 11 Changed 5 years ago by jdemeyer

Replying to ncohen:

These files haven't been reviewed, so I do not think that they should be in our code directly.

Well, src/ext is not considered "our code", so that's not a problem.

comment:13 follow-up: Changed 5 years ago by ncohen

What exactly is it meant to contain? There is also a src/sage/ext/ directory O_o

comment:14 in reply to: ↑ 13 Changed 5 years ago by jdemeyer

Replying to ncohen:

What exactly is it meant to contain?

Well, that's not so clear :-)

At least, it contains certain non-Sage code for PARI and GAP.

comment:15 Changed 5 years ago by ncohen

  • Description modified (diff)
  • Status changed from needs_work to needs_review

Now with an autotooled package ;-)

So ? So ? So ? :-P

Nathann

comment:16 Changed 5 years ago by git

  • Commit changed from 4f8f33dce644b511d120a88b98e779476d895a53 to f33a82b61993aa3a006650c6dcbad5c0f1c3169a

Branch pushed to git repo; I updated commit sha1. New commits:

8c61aa4trac #18187: Merged with 6.7.beta2
f33a82btrac #18187: New autotooled package

comment:17 Changed 5 years ago by ncohen

  • Work issues spkg is not built, make it portable deleted

comment:18 follow-up: Changed 5 years ago by jdemeyer

  • Milestone changed from sage-6.6 to sage-6.7
  • Status changed from needs_review to needs_work

Well, the spkg is still not built by default (see build/deps and build/install).

Did you report your changes upstream?

comment:19 Changed 5 years ago by git

  • Commit changed from f33a82b61993aa3a006650c6dcbad5c0f1c3169a to d3692c1cd9b02e07c1433daca6a6ad8a605f47df

Branch pushed to git repo; I updated commit sha1. New commits:

d3692c1trac #18187: Make it a default spkg

comment:20 in reply to: ↑ 18 Changed 5 years ago by ncohen

  • Status changed from needs_work to needs_review

Helloooooo,

Well, the spkg is still not built by default (see build/deps and build/install).

Right! Fixed.

Did you report your changes upstream?

No I didn't, and for two reasons: 1) What we have in Sage is apparently an old version of the files. When building the first version of this package (without autotools) I tried to use the new ones, but did not figure out how they should be compiled.

2) The makefiles this archive contains are only made to build everything as a shared library, while upstream also builds an independent executable and maybe some other things. They probably wouldn't like what I wrote.

I plan to do both, however, and I will start by sending them an email to ask whether they would accept such a pull request. Then I will try to figure out how to make it all work properly, and we will update our version of this package.

Nathann

comment:21 Changed 5 years ago by jdemeyer

  • Report Upstream changed from N/A to Reported upstream. No feedback yet.
  • Status changed from needs_review to needs_work

Nathann, I will make a new package using your autotools tarball.

comment:22 Changed 5 years ago by jdemeyer

The version of planarity in Sage seems to be version 2.2.0 (but not completely vanilla). So I would try checking out version 2.2.0 from the svn repo and add your autotools system and use that here.

comment:23 follow-up: Changed 5 years ago by ncohen

Oh... You do this because you want us to make sure that we ship the original version of the files ?

comment:24 in reply to: ↑ 23 Changed 5 years ago by jdemeyer

Replying to ncohen:

Oh... You do this because you want us to make sure that we ship the original version of the files ?

Yes. Also I do it because it's a test of your updated autotools files.

comment:25 Changed 5 years ago by jdemeyer

  • Description modified (diff)

comment:26 Changed 5 years ago by ncohen

needs_review ?

comment:27 Changed 5 years ago by git

  • Commit changed from d3692c1cd9b02e07c1433daca6a6ad8a605f47df to 50c7307d29c5261c7bc2fd5b8e3268e9ba021b70

Branch pushed to git repo; I updated commit sha1. New commits:

50c7307Use planarity version 2.2.0

comment:28 Changed 5 years ago by jdemeyer

  • Authors changed from Nathann Cohen to Nathann Cohen, Jeroen Demeyer
  • Reviewers set to Jeroen Demeyer, Nathann Cohen
  • Status changed from needs_work to needs_review

comment:29 Changed 5 years ago by jdemeyer

I took vanilla upstream version 2.2.0 and your autotools files (with a few modifications in the list of source files) and made the new package with make dist. The files are not exactly equal as what was in Sage before, but all --long tests in sage/graphs pass.

comment:30 follow-up: Changed 5 years ago by ncohen

Okay, for me it's good to go. Why did you add those lines to apply patches, given that we don't have any in there?

comment:31 in reply to: ↑ 30 Changed 5 years ago by jdemeyer

  • Status changed from needs_review to positive_review

Replying to ncohen:

Why did you add those lines to apply patches, given that we don't have any in there?

Just in case a future ticket wants to add patches.

comment:32 Changed 5 years ago by vbraun

Fails on OSX. Also, appears to compile nauty which isn't free (definitely not BSD)

libtool: compile:  gcc -DPACKAGE_NAME=\"planarity\" -DPACKAGE_TARNAME=\"planarity\" -DPACKAGE_VERSION=\"2.2.0\" "-DPACKAGE_STRING=\"planarity 2.2.0\"" -DPACKAGE_BUGREPORT=\"John.Boyer.PhD@gmail.com\" -DPACKAGE_URL=\"\" -DPACKAGE=\"planarity\" -DVERSION=\"2.2.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -I. -O3 -MT nauty/nauty.lo -MD -MP -MF nauty/.deps/nauty.Tpo -c nauty/nauty.c  -fno-common -DPIC -o nauty/.libs/nauty.o
In file included from nauty/nautil.c:37:0:
nauty/nauty.h:570:20: fatal error: malloc.h: No such file or directory
 #include <malloc.h>
                    ^
compilation terminated.
make[4]: *** [nauty/nautil.lo] Error 1
libtool: compile:  gcc -DPACKAGE_NAME=\"planarity\" -DPACKAGE_TARNAME=\"planarity\" -DPACKAGE_VERSION=\"2.2.0\" "-DPACKAGE_STRING=\"planarity 2.2.0\"" -DPACKAGE_BUGREPORT=\"John.Boyer.PhD@gmail.com\" -DPACKAGE_URL=\"\" -DPACKAGE=\"planarity\" -DVERSION=\"2.2.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -I. -O3 -MT nauty/outproc.lo -MD -MP -MF nauty/.deps/outproc.Tpo -c nauty/outproc.c  -fno-common -DPIC -o nauty/.libs/outproc.o
In file included from nauty/nauty.c:38:0:
nauty/nauty.h:570:20: fatal error: malloc.h: No such file or directory
 #include <malloc.h>
                    ^
compilation terminated.
make[4]: *** [nauty/nauty.lo] Error 1
In file included from nauty/naututil.h:56:0,
                 from nauty/outproc.c:11:
nauty/nauty.h:570:20: fatal error: malloc.h: No such file or directory
 #include <malloc.h>
                    ^
compilation terminated.
make[4]: *** [nauty/outproc.lo] Error 1

comment:33 Changed 5 years ago by vbraun

  • Status changed from positive_review to needs_work

comment:34 Changed 5 years ago by ncohen

>_<

Okay, I thought that this was only a *part* of Nauty and that the author has negociated specific bits with Brendan McKay? to have this license, but it seems that there is indeed a non-GPL compatible usage restriction (against military applications) in nauty.h.

That's twice in two days that I learn that a massive amount of work was done for naught.

Sorry for that. I will write to the author. And I guess we should go back to the initial sources (which do not include Nauty). And there is this malloc problem to solve.

>_<

Nathann

comment:35 follow-up: Changed 5 years ago by ncohen

Turns out that the 'malloc' problem is just that the POSIX location for malloc is stdlib.h. That was probably one of the things that were change in Sage's copy of the planarity files.

Version 0, edited 5 years ago by ncohen (next)

comment:36 in reply to: ↑ 35 ; follow-up: Changed 5 years ago by jdemeyer

Turns out that the 'malloc' problem is just that the POSIX location for malloc is stdlib.h. That was probably one of the things that were changed in Sage's copy of the planarity files.

In any case, that's the least of our problem..

Last edited 5 years ago by ncohen (previous) (diff)

comment:37 in reply to: ↑ 36 Changed 5 years ago by ncohen

In any case, that's the least of our problem...

Well, why do you say so? We just have to use the first package I built, don't we? This one does not contain any nauty files. And we must patch this malloc.h thing of course.

Nathann

comment:38 Changed 5 years ago by jdemeyer

  • Description modified (diff)

comment:39 Changed 5 years ago by git

  • Commit changed from 50c7307d29c5261c7bc2fd5b8e3268e9ba021b70 to f7a6a70a609810ecadc8e20e8c4742db96f83f51

Branch pushed to git repo; I updated commit sha1. New commits:

f7a6a70Compile Planarity without Nauty

comment:40 follow-up: Changed 5 years ago by ncohen

Hello Jeroen !

Could you explain what exactly you did to the original sources? Did you checkout some specific commit on upstream's svn repository (can you give the commit hash?) and removed the nauty directory?

comment:41 in reply to: ↑ 40 ; follow-up: Changed 5 years ago by jdemeyer

Replying to ncohen:

Did you checkout some specific commit on upstream's svn repository

I checked out version tag 2.2.0

and removed the nauty directory?

Yes, exactly.

And then I added your autotools project, adjusting the list of source files accordingly.

Last edited 5 years ago by jdemeyer (previous) (diff)

comment:42 Changed 5 years ago by jdemeyer

  • Status changed from needs_work to needs_review

comment:43 Changed 5 years ago by jdemeyer

  • Report Upstream changed from Reported upstream. No feedback yet. to None of the above - read trac for reasoning.

comment:44 in reply to: ↑ 41 Changed 5 years ago by ncohen

I checked out version tag 2.2.0

Can you tell me how? I have been checking all versions from 300 to 340 and none of them seems to matche the code in your archive O_o

Nathann

comment:45 Changed 5 years ago by ncohen

/tmp/b/planarity-read-only$ svn ls -v ^/tags
    424 John.Boy              Oct 30  2012 ./
    319 boyerj@c              Sep 19  2010 Version 2.0.0/
    318 boyerj@c              Sep 19  2010 Version 2.1.0/
    320 boyerj@c              Sep 19  2010 Version 2.2.0/
    322 boyerj@c              Sep 19  2010 Version 2.2.1/
    402 John.Boy              Dec 20  2010 Version 3.0.0/
    424 John.Boy              Oct 30  2012 Version 3.0.0.1/

comment:46 Changed 5 years ago by ncohen

By dichotomy, it seems that the first revision containing 'version 2.2' is number 193. But that does not match the one that you packages either.

comment:47 Changed 5 years ago by ncohen

  • Status changed from needs_review to needs_info

comment:48 Changed 5 years ago by ncohen

Okay, I got it with svn checkout http://planarity.googlecode.com/svn/tags/ planarity-read-only.

The correspondance that command above gave me between revisions and tags is quite a wonder.

comment:49 Changed 5 years ago by ncohen

  • Status changed from needs_info to positive_review

Okay okay, good to go ! (again) :-P

Thank you Jeroen, by the way.

Nathann

comment:50 Changed 5 years ago by vbraun

  • Status changed from positive_review to needs_work

Still fails on OSX, this time with:

libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I.. -I.. -I/Users/buildslave-sage/slave/sage_git/build/local/include -I/Users/buildslave-sage/slave/sage_git/build/local/include -O2 -g -fPIC -MT set_ui.lo -MD -MP -MF .deps/set_ui.Tpo -c set_ui.c  -fno-common -DPIC -o .libs/set_ui.o
duplicate symbol _Line in:
    .libs/planarity.o
    .libs/planarityCommandLine.o
duplicate symbol _quietMode in:
    .libs/planarity.o
    .libs/planarityCommandLine.o
duplicate symbol _AdjListsForEmbeddingsOut in:
    .libs/planarity.o
    .libs/planarityCommandLine.o
duplicate symbol _ObstructedOut in:
    .libs/planarity.o
    .libs/planarityCommandLine.o
duplicate symbol _EmbeddableOut in:
    .libs/planarity.o
    .libs/planarityCommandLine.o
duplicate symbol _OrigOut in:
    .libs/planarity.o
    .libs/planarityCommandLine.o
duplicate symbol _Mode in:
    .libs/planarity.o
    .libs/planarityCommandLine.o
duplicate symbol _Line in:
    .libs/planarity.o
    .libs/planarityRandomGraphs.o
duplicate symbol _quietMode in:
    .libs/planarity.o
    .libs/planarityRandomGraphs.o
duplicate symbol _OrigOut in:
    .libs/planarity.o
    .libs/planarityRandomGraphs.o
duplicate symbol _ObstructedOut in:
    .libs/planarity.o
    .libs/planarityRandomGraphs.o
duplicate symbol _EmbeddableOut in:
    .libs/planarity.o
    .libs/planarityRandomGraphs.o
duplicate symbol _AdjListsForEmbeddingsOut in:
    .libs/planarity.o
    .libs/planarityRandomGraphs.o
duplicate symbol _Mode in:
    .libs/planarity.o
    .libs/planarityRandomGraphs.o
duplicate symbol _Line in:
    .libs/planarity.o
    .libs/planaritySpecificGraph.o
duplicate symbol _quietMode in:
    .libs/planarity.o
    .libs/planaritySpecificGraph.o
duplicate symbol _AdjListsForEmbeddingsOut in:
    .libs/planarity.o
    .libs/planaritySpecificGraph.o
duplicate symbol _ObstructedOut in:
    .libs/planarity.o
    .libs/planaritySpecificGraph.o
duplicate symbol _EmbeddableOut in:
    .libs/planarity.o
    .libs/planaritySpecificGraph.o
duplicate symbol _OrigOut in:
    .libs/planarity.o
    .libs/planaritySpecificGraph.o
duplicate symbol _Mode in:
    .libs/planarity.o
    .libs/planaritySpecificGraph.o
duplicate symbol _quietMode in:
    .libs/planarity.o
    .libs/planarityUtils.o
duplicate symbol _Mode in:
    .libs/planarity.o
    .libs/planarityUtils.o
duplicate symbol _OrigOut in:
    .libs/planarity.o
    .libs/planarityUtils.o
duplicate symbol _EmbeddableOut in:
    .libs/planarity.o
    .libs/planarityUtils.o
duplicate symbol _ObstructedOut in:
    .libs/planarity.o
    .libs/planarityUtils.o
duplicate symbol _AdjListsForEmbeddingsOut in:
    .libs/planarity.o
    .libs/planarityUtils.o
duplicate symbol _Line in:
    .libs/planarity.o
    .libs/planarityUtils.o
ld: 28 duplicate symbols for architecture x86_64
collect2: error: ld returned 1 exit status
make[4]: *** [libplanarity.la] Error 1
make[4]: Target `install' not remade because of errors.
gcc -O2 --param max-inline-insns-single=1200  -o insdelln ../obj_s/insdelln.o -Wl,-search_paths_first -I. -I../../test -I../test -DHAVE_CONFIG_H -I. -I../include -I../../test/../include -I/Users/buildslave-sage/slave/sage_git/build/local/include   -D_DARWIN_C_SOURCE -DNDEBUG -O2 --param max-inline-insns-single=1200  -dynamic  `echo "-L../lib -lform -lmenu -lpanel -lncurses -ltinfo  " | sed -e 's/-lform.*-lpanel[^ ]*//'` -lutil  

Jeroen: I can make an account on the OSX buildbot if you need one...

comment:51 Changed 5 years ago by jdemeyer

Sure, you can make me an account.

comment:52 Changed 5 years ago by git

  • Commit changed from f7a6a70a609810ecadc8e20e8c4742db96f83f51 to 66aaaf432d296c55c1325a02dce5cb9e3d5e15f5

Branch pushed to git repo; I updated commit sha1. This was a forced push. New commits:

66aaaf4Compile Planarity without Nauty

comment:53 Changed 5 years ago by jdemeyer

  • Status changed from needs_work to needs_review

I updated the autotools project inside the tarball. I guess it should work but I haven't tested on OS X.

comment:54 Changed 5 years ago by jdemeyer

  • Description modified (diff)

comment:55 Changed 5 years ago by jdemeyer

  • Status changed from needs_review to needs_work

comment:56 Changed 5 years ago by git

  • Commit changed from 66aaaf432d296c55c1325a02dce5cb9e3d5e15f5 to 150b71f111e06fe4ebbf154c1609b55000b4d3bf

Branch pushed to git repo; I updated commit sha1. This was a forced push. New commits:

150b71fCompile Planarity without Nauty

comment:57 Changed 5 years ago by git

  • Commit changed from 150b71f111e06fe4ebbf154c1609b55000b4d3bf to 48ceb25d46bfe4ee15afdf7ad9413985b33769df

Branch pushed to git repo; I updated commit sha1. New commits:

48ceb25Add patch to declare variables "extern"

comment:58 Changed 5 years ago by jdemeyer

  • Status changed from needs_work to positive_review

This now works on OS X.

comment:59 follow-up: Changed 5 years ago by vbraun

  • Dependencies set to #15642
  • Status changed from positive_review to needs_work
>>> Trying to download http://www.sagemath.org/packages/upstream/planarity/planarity-2.2.0.tar.bz2
[...............................................]
Checksum: 3ef0985a2b8476123969cef5c1273d11286605f2 vs 90ff1db146aeffcc330cc9117a72e72aaf4a4fec
Invalid checksum for planarity-2.2.0.tar.bz2.tmp

You need to change the version number when changing the tarball. The buildbots have the old tarball cached now.

comment:60 in reply to: ↑ 59 Changed 5 years ago by jdemeyer

Replying to vbraun:

You need to change the version number when changing the tarball. The buildbots have the old tarball cached now.

Sorry Volker, but I don't get it. Just because the buildbots have tested an earlier version, I have to change the tarball name? Can't you change the buildbot script such that it re-downloads the tarball every time (using wget -N if you use wget) or at least whenever the checksum check failed?

comment:61 Changed 5 years ago by vbraun

The buildbot just relies on Sage to download tarballs.

comment:62 Changed 5 years ago by vbraun

PS: #15642 will re-download tarballs whose checksum does not match

comment:63 Changed 5 years ago by jdemeyer

  • Status changed from needs_work to positive_review

So, since you added the #15642 as dependency, there is no problem, right?

comment:64 Changed 5 years ago by vbraun

  • Dependencies changed from #15642 to #15642, #18417

Turns out sage-spkg doesn't even call sage-download-files if the checksum doesn't match, this is now #18417

comment:65 Changed 5 years ago by vbraun

  • Dependencies changed from #15642, #18417 to #15642, #18428

comment:66 Changed 5 years ago by vbraun

Fixing the downloading is now #18428

comment:67 Changed 5 years ago by jdemeyer

  • Dependencies changed from #15642, #18428 to #18431, #18428
  • Status changed from positive_review to needs_work

Needs work because of #18431

comment:68 Changed 5 years ago by git

  • Commit changed from 48ceb25d46bfe4ee15afdf7ad9413985b33769df to 2ebb2d1329f94876c2aeafc5fcad81a5af9f7364

Branch pushed to git repo; I updated commit sha1. New commits:

2ce8deaMerge tag '6.8.beta2' into t/18187/public/18187
2ebb2d1Add type file

comment:69 Changed 5 years ago by jdemeyer

  • Status changed from needs_work to needs_review

comment:70 Changed 5 years ago by ncohen

  • Status changed from needs_review to positive_review

comment:71 Changed 5 years ago by vbraun

  • Branch changed from public/18187 to 2ebb2d1329f94876c2aeafc5fcad81a5af9f7364
  • Resolution set to fixed
  • Status changed from positive_review to closed
Note: See TracTickets for help on using tickets.