Merge branch 'maint-1.1'
bfedeb097ee9
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on May 21 2014, 11:59.

Description

Merge branch 'maint-1.1'

maint-1.1: installation: GnuPG key server location update installation: README.rst with build status badges WebSession: Python-2.4 combatibility issue fix WebSubmit: file stamper option to copy metadata

Merge note: amended README.rst badge to use master, and removed Python-2.4 compatibiity fix that is not needed since master requires Python-2.6 at least.

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

Committed

Tibor Simko <tibor.simko@cern.ch>

May 21 2014, 12:01

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:bfedeb097ee9: Merge branch 'maint-1.1' (authored by Tibor Simko <tibor.simko@cern.ch>).May 21 2014, 12:01

Commit	Author	Details	Committed
6ee52a896339	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	May 21 2014
09c210d81bed	Tibor Simko	installation: GnuPG key server location update	May 21 2014
9eb20f433d72	Tibor Simko	installation: README.rst with build status badges	May 21 2014
391be32e0c18	Nikolaos Kasioumis/Tibor Simko	WebSession: Python-2.4 combatibility issue fix	Apr 17 2014
70f1dc609105	Nikolaos Kasioumis/Tibor Simko	WebSubmit: file stamper option to copy metadata	Apr 17 2014

				Path
	M			INSTALL
	P			README.rst Copied from README
	M			modules/websession/lib/websession_templates.py
	M			modules/websubmit/doc/hacking/websubmit-file-stamper.webdoc
	M			modules/websubmit/lib/websubmit_file_stamper.py