Diffusion invenio-infoscience 8b101e6b9581

Merge branch 'master' into next
8b101e6b9581
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Apr 26 2013, 15:16.

Description

Merge branch 'master' into next

master: BibClassify: remove ability to run as standalone

Conflicts:
modules/miscutil/lib/messages_unit_tests.py

Details

Committed

Tibor Simko <tibor.simko@cern.ch>

Apr 26 2013, 15:16

Parents

R3600:028986c49613: BibClassify: remove ability to run as standalone
R3600:a240a50ce571: Merge branch 'master' into next

Branches

Unknown

Tags

Unknown

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:8b101e6b9581: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Apr 26 2013, 15:16

Merged Changes

	Commit			Author	Details	Committed
	028986c49613			Lars Holm Nielsen/Tibor Simko	BibClassify: remove ability to run as standalone	Apr 26 2013

Changes (46)

				Path
	M			modules/bibauthorid/lib/bibauthorid_cli.py
	M			modules/bibauthorid/lib/bibauthorid_cluster_set.py
	M			modules/bibauthorid/lib/bibauthorid_comparison.py
	M			modules/bibauthorid/lib/bibauthorid_config.py
	M			modules/bibauthorid/lib/bibauthorid_daemon.py
	M			modules/bibauthorid/lib/bibauthorid_dbinterface.py
	M			modules/bibauthorid/lib/bibauthorid_frontinterface.py
	M			modules/bibauthorid/lib/bibauthorid_general_utils.py
	M			modules/bibauthorid/lib/bibauthorid_least_squares.py
	M			modules/bibauthorid/lib/bibauthorid_personid_maintenance.py
	M			modules/bibauthorid/lib/bibauthorid_prob_matrix.py
	M			modules/bibauthorid/lib/bibauthorid_rabbit.py
	M			modules/bibauthorid/lib/bibauthorid_recipes.py
	M			modules/bibauthorid/lib/bibauthorid_scheduler.py
	M			modules/bibauthorid/lib/bibauthorid_searchinterface.py
	M			modules/bibauthorid/lib/bibauthorid_tortoise.py
	M			modules/bibauthorid/lib/bibauthorid_webapi.py
	M			modules/bibauthorid/lib/bibauthorid_webauthorprofileinterface.py
	M			modules/bibauthorid/lib/bibauthorid_wedge.py
	M			modules/bibclassify/lib/bibclassify_cli.py
	M			modules/bibclassify/lib/bibclassify_config.py
	M			modules/bibclassify/lib/bibclassify_daemon.py
	M			modules/bibclassify/lib/bibclassify_engine.py
	M			modules/bibclassify/lib/bibclassify_keyword_analyzer.py
	M			modules/bibclassify/lib/bibclassify_microtests.py
	M			modules/bibclassify/lib/bibclassify_ontology_reader.py
	M			modules/bibclassify/lib/bibclassify_regression_tests.py
	M			modules/bibclassify/lib/bibclassify_templates.py
	M			modules/bibclassify/lib/bibclassify_text_extractor.py
	M			modules/bibclassify/lib/bibclassify_text_normalizer.py
	M			modules/bibclassify/lib/bibclassify_unit_tests.py
	M			modules/bibclassify/lib/bibclassify_webinterface.py
	M			modules/bibindex/lib/bibindex_engine_tokenizer_unit_tests.py
	M			modules/bibknowledge/lib/bibknowledge.py
	M			modules/bibmerge/lib/bibmerge_templates.py
	M			modules/bibsort/lib/bibsort_engine.py
	M			modules/bibupload/lib/batchuploader_engine.py
	M			modules/elmsubmit/lib/elmsubmit_html2txt.py
	M			modules/miscutil/lib/messages_unit_tests.py
	M			modules/miscutil/lib/sequtils_cnum.py
	M			modules/webaccess/lib/access_control_config.py
	M			modules/webauthorprofile/lib/webauthorprofile_cli.py
	M			modules/webauthorprofile/lib/webauthorprofile_daemon.py
	M			modules/webbasket/lib/webbasket_webinterface.py
	M			modules/webcomment/lib/webcommentadminlib.py
	M			modules/webstat/lib/webstatadmin.py