Reynold Xin 012c9e5ab0 Revert "Merge pull request #596 from esjewett/master" because the ... dependency on hbase introduces netty-3.2.2 which conflicts with netty-3.5.3 already in Spark. This caused multiple test failures. This reverts commit 0f1b7a06e1, reversing changes made to aacca1b8a8.		2013-05-09 14:20:01 -07:00
..
src/main	Revert "Merge pull request #596 from esjewett/master" because the	2013-05-09 14:20:01 -07:00
pom.xml	Attempt at fixing merge conflict	2013-04-24 09:24:17 +05:30