commit | 677206dbf5c35d9c7f8b26e9a3846304865484e1 | [log] [tgz] |
---|---|---|
author | Madhusudan.C.S <madhusudancs@gmail.com> | Fri May 03 16:47:53 2013 -0700 |
committer | Madhusudan.C.S <madhusudancs@gmail.com> | Fri May 03 16:47:53 2013 -0700 |
tree | 3253c68e75a29e893bd288d05105f366aceb2bb9 | |
parent | 86a0480e03e7f806ff615beeaac9af6adebe49ba [diff] [blame] | |
parent | 93b74a811928e25712916216aebfd247169ba6ff [diff] [blame] |
Merge asterix_lsm_stabilization into madhusudancs/parallelize_result_distribution.
diff --git a/.gitignore b/.gitignore index 6d41006..d748fde 100644 --- a/.gitignore +++ b/.gitignore
@@ -7,4 +7,4 @@ asterix-app/mdtest/ asterix-app/opttest/ build -asterix_logs +asterix_logs \ No newline at end of file