Merge branch 'redistro' of github.com:ahupowerdns/pdns into redistro

Conflicts:
	pdns/distributor.hh

diff --cc pdns/distributor.hh
index b842bf9a3c7684546cdd4666aba66c956e61f1ec,ba3ce0e248ba902834d3b253dfcdfd878eac9308..f50e65fabfcfe62d94c5d4183a8166b231ad1625
--- 1/pdns/distributor.hh
--- 2/pdns/distributor.hh
+++ b/pdns/distributor.hh
@@@ -52,11 -61,16 +52,10 @@@ template<class Answer, class Question, 
  {
  public:
    static Distributor *Create(int n=1); //!< Create a new Distributor with \param n threads
 -
 -  virtual void cleanup();
 -  virtual int question(Question *, void (*)(const AnswerData<Answer> &)) =0; //!< Submit a question to the Distributor
 -  virtual void getQueueSizes(int &questions, int &answers) =0; //!< Returns length of question queue
 -
 -  virtual int getNumBusy() =0;
 -
 +  typedef std::function<void(Answer*)> callback_t;
 +  virtual int question(Question *, callback_t callback) =0; //!< Submit a question to the Distributor
 +  virtual int getQueueSize() =0; //!< Returns length of question queue
    virtual bool isOverloaded() =0;
--
 -private:
  };
  
  template<class Answer, class Question, class Backend> class SingleThreadDistributor