Gitiles
Code Review Sign In
asterix-gerrit.ics.uci.edu / hyracks / bef5ad00fd32b3ae73d8a100b55c48cd550ce584^1..bef5ad00fd32b3ae73d8a100b55c48cd550ce584 / .
commitbef5ad00fd32b3ae73d8a100b55c48cd550ce584[log] [tgz]
authorNan Zhang <zhangnan2920214@gmail.com>Tue May 14 10:09:37 2013 -0700
committerNan Zhang <zhangnan2920214@gmail.com>Tue May 14 10:09:37 2013 -0700
treed77bb569182e82f1d95960185fe39bccfc173809
parent9bb94d2381ea454c8b905429518a16edc3b31a4e [diff]
parent399157287adca3889155f5a5a7a5e905749f1ad3 [diff]
Merge branch 'genomix/fullstack_genomix' of https://code.google.com/p/hyracks into genomix/fullstack_genomix

diff --git a/.gitignore b/.gitignore
index 31c9fc1..2bd714d 100644
--- a/.gitignore
+++ b/.gitignore

@@ -14,3 +14,4 @@
 hadoop-conf-tmp
 metastore_db
 teststore
+.DS_Store

diff --git a/genomix/genomix-hadoop/data/.DS_Store b/genomix/genomix-hadoop/data/.DS_Store
deleted file mode 100644
index 6334939..0000000
--- a/genomix/genomix-hadoop/data/.DS_Store
+++ /dev/null
Binary files differ

diff --git a/genomix/genomix-hadoop/expected/.DS_Store b/genomix/genomix-hadoop/expected/.DS_Store
deleted file mode 100644
index 266ed3b..0000000
--- a/genomix/genomix-hadoop/expected/.DS_Store
+++ /dev/null
Binary files differ

diff --git a/genomix/genomix-hadoop/src/.DS_Store b/genomix/genomix-hadoop/src/.DS_Store
deleted file mode 100644
index e0bf627..0000000
--- a/genomix/genomix-hadoop/src/.DS_Store
+++ /dev/null
Binary files differ

diff --git a/genomix/genomix-hadoop/src/main/.DS_Store b/genomix/genomix-hadoop/src/main/.DS_Store
deleted file mode 100644
index 325c6de..0000000
--- a/genomix/genomix-hadoop/src/main/.DS_Store
+++ /dev/null
Binary files differ

diff --git a/genomix/genomix-hadoop/src/main/java/.DS_Store b/genomix/genomix-hadoop/src/main/java/.DS_Store
deleted file mode 100644
index dd6c872..0000000
--- a/genomix/genomix-hadoop/src/main/java/.DS_Store
+++ /dev/null
Binary files differ

diff --git a/genomix/genomix-hadoop/src/main/java/edu/.DS_Store b/genomix/genomix-hadoop/src/main/java/edu/.DS_Store
deleted file mode 100644
index 5e0c641..0000000
--- a/genomix/genomix-hadoop/src/main/java/edu/.DS_Store
+++ /dev/null
Binary files differ

diff --git a/genomix/genomix-hadoop/src/main/java/edu/uci/.DS_Store b/genomix/genomix-hadoop/src/main/java/edu/uci/.DS_Store
deleted file mode 100644
index 4f27e83..0000000
--- a/genomix/genomix-hadoop/src/main/java/edu/uci/.DS_Store
+++ /dev/null
Binary files differ

diff --git a/genomix/genomix-hadoop/src/main/java/edu/uci/ics/.DS_Store b/genomix/genomix-hadoop/src/main/java/edu/uci/ics/.DS_Store
deleted file mode 100644
index 8f46380..0000000
--- a/genomix/genomix-hadoop/src/main/java/edu/uci/ics/.DS_Store
+++ /dev/null
Binary files differ

diff --git a/genomix/genomix-hadoop/src/main/java/edu/uci/ics/genomix/.DS_Store b/genomix/genomix-hadoop/src/main/java/edu/uci/ics/genomix/.DS_Store
deleted file mode 100644
index 7880be8..0000000
--- a/genomix/genomix-hadoop/src/main/java/edu/uci/ics/genomix/.DS_Store
+++ /dev/null
Binary files differ

diff --git a/genomix/genomix-hadoop/src/main/java/edu/uci/ics/genomix/gbresultschecking/.DS_Store b/genomix/genomix-hadoop/src/main/java/edu/uci/ics/genomix/gbresultschecking/.DS_Store
deleted file mode 100644
index f5eb144..0000000
--- a/genomix/genomix-hadoop/src/main/java/edu/uci/ics/genomix/gbresultschecking/.DS_Store
+++ /dev/null
Binary files differ

diff --git a/genomix/genomix-hadoop/src/main/java/edu/uci/ics/genomix/graphbuilding/.DS_Store b/genomix/genomix-hadoop/src/main/java/edu/uci/ics/genomix/graphbuilding/.DS_Store
deleted file mode 100644
index 2ee03fe..0000000
--- a/genomix/genomix-hadoop/src/main/java/edu/uci/ics/genomix/graphbuilding/.DS_Store
+++ /dev/null
Binary files differ

diff --git a/genomix/genomix-hadoop/src/main/java/edu/uci/ics/genomix/pathmergingh1/.DS_Store b/genomix/genomix-hadoop/src/main/java/edu/uci/ics/genomix/pathmergingh1/.DS_Store
deleted file mode 100644
index f9e3926..0000000
--- a/genomix/genomix-hadoop/src/main/java/edu/uci/ics/genomix/pathmergingh1/.DS_Store
+++ /dev/null
Binary files differ

diff --git a/genomix/genomix-hadoop/src/main/java/edu/uci/ics/genomix/pathmergingh2/.DS_Store b/genomix/genomix-hadoop/src/main/java/edu/uci/ics/genomix/pathmergingh2/.DS_Store
deleted file mode 100644
index 1802942..0000000
--- a/genomix/genomix-hadoop/src/main/java/edu/uci/ics/genomix/pathmergingh2/.DS_Store
+++ /dev/null
Binary files differ

diff --git a/genomix/genomix-hadoop/src/main/java/edu/uci/ics/genomix/statistics/.DS_Store b/genomix/genomix-hadoop/src/main/java/edu/uci/ics/genomix/statistics/.DS_Store
deleted file mode 100644
index a38b133..0000000
--- a/genomix/genomix-hadoop/src/main/java/edu/uci/ics/genomix/statistics/.DS_Store
+++ /dev/null
Binary files differ

diff --git a/genomix/genomix-hadoop/src/test/.DS_Store b/genomix/genomix-hadoop/src/test/.DS_Store
deleted file mode 100644
index bfe14e8..0000000
--- a/genomix/genomix-hadoop/src/test/.DS_Store
+++ /dev/null
Binary files differ

diff --git a/genomix/genomix-hadoop/src/test/java/.DS_Store b/genomix/genomix-hadoop/src/test/java/.DS_Store
deleted file mode 100644
index fb3684c..0000000
--- a/genomix/genomix-hadoop/src/test/java/.DS_Store
+++ /dev/null
Binary files differ

diff --git a/genomix/genomix-hadoop/src/test/java/edu/.DS_Store b/genomix/genomix-hadoop/src/test/java/edu/.DS_Store
deleted file mode 100644
index f50e64b..0000000
--- a/genomix/genomix-hadoop/src/test/java/edu/.DS_Store
+++ /dev/null
Binary files differ

diff --git a/genomix/genomix-hadoop/src/test/java/edu/uci/.DS_Store b/genomix/genomix-hadoop/src/test/java/edu/uci/.DS_Store
deleted file mode 100644
index 9aea623..0000000
--- a/genomix/genomix-hadoop/src/test/java/edu/uci/.DS_Store
+++ /dev/null
Binary files differ

diff --git a/genomix/genomix-hadoop/src/test/java/edu/uci/ics/.DS_Store b/genomix/genomix-hadoop/src/test/java/edu/uci/ics/.DS_Store
deleted file mode 100644
index 64f18c4..0000000
--- a/genomix/genomix-hadoop/src/test/java/edu/uci/ics/.DS_Store
+++ /dev/null
Binary files differ

diff --git a/genomix/genomix-hadoop/src/test/java/edu/uci/ics/genomix/.DS_Store b/genomix/genomix-hadoop/src/test/java/edu/uci/ics/genomix/.DS_Store
deleted file mode 100644
index 14d85eb..0000000
--- a/genomix/genomix-hadoop/src/test/java/edu/uci/ics/genomix/.DS_Store
+++ /dev/null
Binary files differ