| commit | 5715ada60723199560324f6a4ad48996c973f30d | [log] [tgz] |
|---|---|---|
| author | salsubaiee <salsubaiee@gmail.com> | Fri Apr 19 20:35:18 2013 -0700 |
| committer | salsubaiee <salsubaiee@gmail.com> | Fri Apr 19 20:35:18 2013 -0700 |
| tree | f121268d89bfda808693dbd66d0180b21cf54d2e | |
| parent | 6d5a9dd9e4d6a0b8881c697862e1d1751991ef5c [diff] | |
| parent | a4b2d159cdd74b8248ef7f1f023709ae4db0d8ca [diff] |
Merge branch 'salsubaiee/full_stack_lsm_staging_fix_index_search_callback' into fullstack_lsm_staging. (code reviewed by Zack).
diff --git a/.gitignore b/.gitignore index 3dff533..328b7d3 100644 --- a/.gitignore +++ b/.gitignore
@@ -2,3 +2,4 @@ .classpath .settings .project +ClusterControllerService