Fangjin Yang 82f02a4fe4 Merge branch 'master' into indexing_refactor ...

Conflicts:
	merger/src/main/java/com/metamx/druid/merger/common/TaskStatus.java
	merger/src/main/java/com/metamx/druid/merger/common/task/DeleteTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/IndexDeterminePartitionsTask.java
	merger/src/main/java/com/metamx/druid/merger/common/task/Task.java
	merger/src/main/java/com/metamx/druid/merger/common/task/V8toV9UpgradeTask.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/MergerDBCoordinator.java
	merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java
	merger/src/test/java/com/metamx/druid/merger/coordinator/RemoteTaskRunnerTest.java

2013-02-13 16:34:14 -08:00

..

src

Merge branch 'master' into indexing_refactor

2013-02-13 16:34:14 -08:00

pom.xml

1) Move up to Jackson 2.1

2013-02-12 20:58:17 -06:00