commit 2322b5df5a9e5560fe13b0448ee1e942c4c15491
author Matt Hayes <mhayes@linkedin.com> Mon Jan 21 12:03:28 2013 -0800
committer Matt Hayes <mhayes@linkedin.com> Mon Jan 21 12:03:28 2013 -0800
tree cf747fb37e9a5fc15220cc991c3610415943cc3e
parent fb76eccaf1aaf84ef4ff03186c713e6e3d104069
parent a459cc7c4360b727e254015b66603ebdc933b787

Merge branch 'master' of github.com:linkedin/datafu

.classpath

diff --git a/.classpath b/.classpath
index ff1c7d1..dc863a0 100644
--- a/.classpath
+++ b/.classpath
@@ -5,7 +5,7 @@
 	<classpathentry kind="src" path="test/pig"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
-	<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?ivyXmlPath=ivy.xml&amp;confs=*"/>
+	<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=datafu&amp;ivyXmlPath=ivy.xml&amp;confs=*"/>
 	<classpathentry kind="lib" path="otherlibs/pigunit-0.9.jar"/>
 	<classpathentry kind="output" path="dist/testclasses"/>
 </classpath>

.project

diff --git a/.project b/.project
index 5aa6870..022f4a7 100644
--- a/.project
+++ b/.project
@@ -13,5 +13,6 @@
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.apache.ivyde.eclipse.ivynature</nature>
 	</natures>
 </projectDescription>