Changeset [046b820cb5fd2a8aacb6a4d38fef2313536d6691] by Prashanth Mundkur
December 6th, 2012 @ 12:16 PM
Merge branch 'master' into devel/scheduler
Conflicts:
lib/disco/task.py lib/disco/worker/__init__.py
https://github.com/discoproject/disco/commit/046b820cb5fd2a8aacb6a4...
Committed by Prashanth Mundkur
- A conf/gen.settings.sys-NetBSD
- A lib/disco/compat.py
- A make-discoproject-debian
- R lib/disco/future.py
- R lib/disco/json.py
- M AUTHORS
- M Makefile
- M bin/ddfscli.py
- M bin/discocli.py
- M conf/gen.settings.sh
- M conf/gen.settings.sys-Darwin
- M conf/gen.settings.sys-Debian
- M conf/gen.settings.sys-Linux
- M doc/howto/chunk.rst
- M doc/howto/worker.rst
- M doc/releases.rst
- M doc/start/install.rst
- M doc/start/install_sys.rst
- M doc/start/troubleshoot.rst
- M doc/start/tutorial.rst
- M doc/start/tutorial_2.rst
- M examples/faq/chain.py
- M examples/util/count_words.py
- M examples/util/query_ddb.py
- M ext/disco.c
- M lib/clx/__init__.py
- M lib/clx/server.py
- M lib/clx/settings.py
- M lib/disco/cli.py
- M lib/disco/comm.py
- M lib/disco/comm_pycurl.py
- M lib/disco/core.py
- M lib/disco/dPickle.py
- M lib/disco/ddfs.py
- M lib/disco/error.py
- M lib/disco/eventmonitor.py
- M lib/disco/fileutils.py
- M lib/disco/job.py
- M lib/disco/schemes/__init__.py
- M lib/disco/schemes/scheme_discodb.py
- M lib/disco/schemes/scheme_raw.py
- M lib/disco/schemes/scheme_url.py
- M lib/disco/task.py
- M lib/disco/test.py
- M lib/disco/util.py
- M lib/disco/worker/__init__.py
- M lib/disco/worker/classic/external.py
- M lib/disco/worker/classic/func.py
- M lib/disco/worker/classic/modutil.py
- M lib/disco/worker/classic/netstring.py
- M lib/disco/worker/classic/worker.py
- M master/.version
- M master/src/ddfs/ddfs_gc_main.erl
- M master/src/ddfs/ddfs_gc_node.erl
- M master/src/ddfs/ddfs_get.erl
- M master/src/ddfs/ddfs_node.erl
- M master/src/ddfs/ddfs_put.erl
- M master/src/ddfs/ddfs_tag.erl
- M master/src/jobpack.erl
- M pkg/debian/Makefile
- M pkg/debian/changelog
- M pkg/debian/control
- M pkg/debian/gen.create-disco-user.sh
- M pkg/debian/rules
- M tests/run_tests_python25
- M tests/runtests.py
- M tests/test_50k.py
- M tests/test_async.py
- M tests/test_authjob.py
- M tests/test_blacklist.py
- M tests/test_chain.py
- M tests/test_chunker.py
- M tests/test_config.py
- M tests/test_ddfs.py
- M tests/test_discoapi.py
- M tests/test_discoproto.py
- M tests/test_external.py
- M tests/test_flow.py
- M tests/test_forcesched.py
- M tests/test_init.py
- M tests/test_input.py
- M tests/test_jobpack.py
- M tests/test_mapresults.py
- M tests/test_modutil.py
- M tests/test_oob.py
- M tests/test_pickle.py
- M tests/test_profile.py
- M tests/test_protocol.py
- M tests/test_ratelimit.py
- M tests/test_raw.py
- M tests/test_redundant.py
- M tests/test_save.py
- M tests/test_schemes.py
- M tests/test_simple.py
- M tests/test_sort.py
- M tests/test_streams.py
- M tests/test_tempfail.py
- M tests/test_util.py
- M tests/test_waitmany.py
- M tests/testcases.py
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป
Disco is an open-source implementation of the Map-Reduce framework for distributed computing. As the original framework, Disco supports parallel computations over large data sets on unreliable cluster of computers.