| commit | 60da9ffddbeac16c3e9fbb024b4843e74a1a8072 | [log] [tgz] |
|---|---|---|
| author | Deep Ganguli <deep@metamarkets.com> | Fri Feb 15 13:22:31 2013 -0800 |
| committer | Deep Ganguli <deep@metamarkets.com> | Fri Feb 15 13:22:31 2013 -0800 |
| tree | cd74925b8dd2632a2e22d557e96c8fb52578e972 | |
| parent | e042c29173c0c139dfa18e5dd44b45e20bc67acb [diff] | |
| parent | 06ef83db69d5244c819f342b9fa6a061cd3419a5 [diff] |
Merge branch 'master' into hadoop-index-task Conflicts: common/src/main/java/com/metamx/druid/utils/JodaUtils.java indexer/src/main/java/com/metamx/druid/indexer/DbUpdaterJob.java indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerConfig.java indexer/src/main/java/com/metamx/druid/indexer/IndexGeneratorJob.java