Merge branch 'maint-1.1'
42b46ff9ed24
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Mar 5 2013, 21:58.

Description

Merge branch 'maint-1.1'

maint-1.1: BibDocFile: display "Restricted" label correctly BibDocFile: fix check-md5 with bibdocfsinfo cache BibCatalog: removal of print statement WebStat: use CFG_JOURNAL_TAG instead of 773/909C4

Conflicts:
modules/bibdocfile/lib/bibdocfile.py

Committed

Tibor Simko <tibor.simko@cern.ch>

Mar 5 2013, 22:09

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:42b46ff9ed24: Merge branch 'maint-1.1' (authored by Tibor Simko <tibor.simko@cern.ch>).Mar 5 2013, 22:09

Commit	Author	Details	Committed
58e8813f7b04	Nikolaos Kasioumis/Tibor Simko	BibDocFile: display "Restricted" label correctly	Mar 5 2013
7317b2f6cbf6	Samuele Kaplun/Tibor Simko	BibDocFile: fix check-md5 with bibdocfsinfo cache	Mar 5 2013
539a9ee5215d	Jan Aage Lavik/Tibor Simko	BibCatalog: removal of print statement	Mar 5 2013
337bcc726b3b	Carmen Alvarez Perez/Tibor Simko	WebStat: use CFG_JOURNAL_TAG instead of 773/909C4	Mar 5 2013

				Path
	M			modules/bibcatalog/lib/bibcatalog_system_rt.py
	M			modules/bibdocfile/lib/bibdocfile.py
	M			modules/bibdocfile/lib/bibdocfile_templates.py
	M			modules/bibdocfile/lib/bibdocfilecli.py
	M			modules/webstat/lib/webstat.py