I'm not particularly enthused with those two branches. They can go. - Peter
On Sun, Jun 15, 2014 at 11:08 AM, Matthew Knepley <[email protected]> wrote: > I believe I have pushed Geoff's changes, but he can correct me if that is > wrong. > > My opt control branch can stay unmerged. > > Matt > On Jun 15, 2014 10:28 AM, "Satish Balay" <[email protected]> wrote: > >> On Thu, 12 Jun 2014, Barry Smith wrote: >> >> > >> > Please get all changes into master before 9pm central time USA on >> Sunday June 15th that you would like in the release. At that time Satish >> will make a release branch and the only changes allowed in that release >> branch will be bug fixes that do not change the API. >> > >> >> Perhaps some of these branches [which are already merged to next] should >> be merged to master? >> [and if they are false positives - perhaps those branches should be >> deleted?] >> >> thanks, >> Satish >> >> ------- >> >> $ candidate-branches next master >> Candidate for master: refs/remotes/origin/irving/doc-cleanup Fri Jan 31 >> 23:42:04 2014 -0700 >> Candidate for master: refs/remotes/origin/irving/snes-ex12-cleanup Fri >> Dec 13 15:24:09 2013 -0800 >> Candidate for master: refs/remotes/origin/jed/log-event-lookup Thu Apr 17 >> 18:39:48 2014 -0600 >> Candidate for master: refs/remotes/origin/jed/mat-ptap-maij-bs Thu Apr 17 >> 12:06:29 2014 -0600 >> Candidate for master: refs/remotes/origin/jed/vecghostgetvalues Sat Jun >> 14 22:28:04 2014 -0500 >> Candidate for master: refs/remotes/origin/jed/vecop Thu Apr 17 08:43:03 >> 2014 -0600 >> Candidate for master: refs/remotes/origin/karpeev/fix-ksp-pcgasm Wed Jun >> 4 06:14:36 2014 -0500 >> Candidate for master: refs/remotes/origin/knepley/feature-optcontrol-mg >> Wed Jun 11 14:34:25 2014 -0500 >> Candidate for master: refs/remotes/origin/madams/sr-driver4 Fri Oct 25 >> 14:43:12 2013 -0400 >> Candidate for master: refs/remotes/origin/mlange05/fix-gmsh-coordinates >> Tue Apr 1 10:45:39 2014 +0100 >> Candidate for master: >> refs/remotes/origin/paulmullowney/aijcusp-ellpack-fix Tue Aug 6 10:34:13 >> 2013 -0500 >> Candidate for master: refs/remotes/origin/prbrune/sf-examplefix Fri Dec >> 13 11:38:36 2013 -0600 >> Candidate for master: refs/remotes/origin/prbrune/snes-ex19vtkoutput Wed >> Jul 24 10:40:02 2013 -0500 >> Candidate for master: refs/remotes/origin/sarich/fix-tao-valgrind-warning >> Fri Apr 4 10:58:28 2014 -0500 >> Candidate for master: refs/remotes/origin/sarich/tao-purge-dm Fri Jun 13 >> 11:10:05 2014 -0500 >> Candidate for master: >> refs/remotes/origin/stefano_zampini/pcbddc-applytranspose Mon Nov 18 >> 16:32:38 2013 +0100 >> Candidate for master: >> refs/remotes/origin/stefano_zampini/pcbddc-globalordering-api Tue Nov 12 >> 17:04:42 2013 +0100 >> Candidate for master: >> refs/remotes/origin/stefano_zampini/pcbddcgraph-improved Tue Jun 3 16:44:29 >> 2014 +0300 >> Candidate for master: >> refs/remotes/origin/stefano_zampini/pcredundant-transpose Tue Jan 7 >> 14:52:15 2014 +0100 >> >>
