Merge branch 'maint-1.1'
4b1d324f3059
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Jan 19 2014, 16:17.

Description

Merge branch 'maint-1.1'

maint-1.1: BatchUploader: rights to ::1 for robot upload Travis CI: initial release of configuration installation: pip requirements intbitset: no crash when intbitset is on rhs

NOTE The intbitset commit ab687a1351d5bcef9965530cc5b8a3b039726b57 from maint-1.x branches was left out during merge; a separate patch for master will follow. (see #1287)

Conflicts:
config/invenio.conf
modules/miscutil/lib/intbitset.c
modules/miscutil/lib/intbitset.pyx
requirements-extras.txt
requirements.txt

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

Committed

Tibor Simko <tibor.simko@cern.ch>

Jan 19 2014, 16:20

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:4b1d324f3059: Merge branch 'maint-1.1' (authored by Tibor Simko <tibor.simko@cern.ch>).Jan 19 2014, 16:20

Commit	Author	Details	Committed
02ebed45bd24	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Jan 17 2014
19e8fc2a6c44	Tibor Simko	BatchUploader: rights to ::1 for robot upload	Jan 17 2014
5b6225743b2f	Tibor Simko	Travis CI: initial release of configuration	Jan 17 2014
d9150706b465	Tibor Simko	installation: pip requirements	Jan 17 2014
db43046de83f	Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Dec 16 2013
ab687a1351d5	Samuele Kaplun/Tibor Simko	intbitset: no crash when intbitset is on rhs	Dec 16 2013

				Path
	M			.travis.yml
	M			config/invenio.conf