Homec4science

Merge branch 'maint-1.1'

Authored by Tibor Simko <tibor.simko@cern.ch> on Jan 26 2015, 14:46.

Description

Merge branch 'maint-1.1'

  • maint-1.1: OAIHarvest: remove_duplicates and regexp fixes
  • NOTE The merge conflicts resolved according to PR #2601.

Conflicts:
modules/oaiharvest/lib/oai_harvest_daemon.py

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

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:565931f9a411: Merge branch 'maint-1.1' (authored by Tibor Simko <tibor.simko@cern.ch>).Jan 26 2015, 15:06

Merged Changes

CommitAuthorDetailsCommitted
3d60603e08d0Alexander Wagner/Tibor Simko
OAIHarvest: remove_duplicates and regexp fixes 
Jan 26 2015