Permalink
Browse files

Merge branch 'master' into hadoop62

Conflicts:
	testing/run_treasury.py
  • Loading branch information...
2 parents 1a85557 + 405d0bb commit 65fdb7ea594db7c1674bcc5751844a9ef0c7ee23 @mpobrien mpobrien committed Apr 15, 2013
View
@@ -1,4 +1,4 @@
-o*.pyc
+*.pyc
*.class
.classpath
.project
@@ -0,0 +1,32 @@
+==============
+pymongo_hadoop
+==============
+:Info: See `documentation <http://api.mongodb.org>`_ for more information. See `github <http://github.com/mongodb/mongo-hadoop/>`_ for the latest source.
+:Author: Brendan McAdams
+:Maintainer: Mike O'Brien <mikeo@10gen.com>
+
+About
+=====
+
+The pymongo_hadoop module contains basic classes for using python
+scripts for Hadoop Streaming jobs with the mongo-hadoop adapter.
+
+Issues / Questions / Feedback
+=============================
+
+Any issues with, questions about, or feedback for PyMongo should be
+sent to the mongodb-user list on Google Groups. For confirmed issues
+or feature requests, open a case on `jira
+<http://jira.mongodb.org/browse/HADOOP>`_. Please do not e-mail any of the
+developers directly with issues or questions - you're more likely to
+get an answer on the list.
+
+Installation
+============
+
+If you have `setuptools
+<http://peak.telecommunity.com/DevCenter/setuptools>`_ installed you
+should be able to do **easy_install pymongo_hadoop** to install
+the module. Otherwise you can download the project source and do **python
+setup.py install** to install.
+
Oops, something went wrong.

0 comments on commit 65fdb7e

Please sign in to comment.