Merge branch 'maint-1.0' into maint-1.1
c8951cdae4a7
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Nov 27 2013, 18:04.

Description

Merge branch 'maint-1.0' into maint-1.1

maint-1.0: BatchUploader: avoid tempfile.tempdir redefinition BibRank: temporary file storage in CFG_TMPDIR

Conflicts:
modules/bibrank/lib/bibrank_grapher.py
modules/bibupload/lib/batchuploader.py
modules/bibupload/lib/batchuploader_engine.py

Signed-off-by: Tibor Simko <tibor.simko@cern.ch>

Committed

Tibor Simko <tibor.simko@cern.ch>

Nov 27 2013, 18:04

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:c8951cdae4a7: Merge branch 'maint-1.0' into maint-1.1 (authored by Tibor Simko <tibor.simko@cern.ch>).Nov 27 2013, 18:04

Commit	Author	Details	Committed
4a7091267761	Jerome Caffaro/Tibor Simko	BatchUploader: avoid tempfile.tempdir redefinition	Nov 27 2013
ff91087ce898	Tibor Simko	Merge branch 'maint-0.99' into maint-1.0	Nov 27 2013
074f06c407ab	Jerome Caffaro/Tibor Simko	BibRank: temporary file storage in CFG_TMPDIR	Nov 27 2013

				Path
	M			modules/bibrank/lib/bibrank_grapher.py
	M			modules/bibupload/lib/batchuploader.py
	M			modules/bibupload/lib/batchuploader_engine.py