| commit | 120b822c183f7332a220179c1a605e2d1bdae530 | [log] [tgz] |
|---|---|---|
| author | Fangjin Yang <fangjin@metamarketsgroup.com> | Mon Apr 08 11:24:17 2013 -0700 |
| committer | Fangjin Yang <fangjin@metamarketsgroup.com> | Mon Apr 08 11:24:17 2013 -0700 |
| tree | b7608b94adf240f6cbcbd6c3a6c8fc73ec0a1e3a | |
| parent | 925c104dd21e1c0c4ebfeac755ac3f020ce421e1 [diff] | |
| parent | be47c2003f511fa3c69a2acb584e7f40570462a4 [diff] |
Merge branch 'master' of github.com:metamx/druid Conflicts: client/src/main/java/com/metamx/druid/QueryableNode.java server/src/main/java/com/metamx/druid/http/ComputeNode.java