Merge branch 'lmdb-back' of https://github.com/mzealey/pdns into mzealey-lmdb-back

Conflicts:
	.travis.yml

diff --cc .travis.yml
index f67ed825b8c0e6e0ca9584a8877455ac55961ff2,cb541b611f1e93ff44ce2677fdb217584ef3060e..06b3844d6e023c0ea6dc42f418718d40d39e02f0
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -7,7 -6,10 +7,10 @@@ before_script
   - sudo /sbin/ip addr add 10.0.3.0/24 dev lo
   - sudo rm /etc/apt/sources.list.d/travis_ci_zeromq3-source.list
   - sudo apt-get update
 - - sudo apt-get install libboost-all-dev libtolua-dev bc libcdb-dev libnet-dns-perl unbound-host ldnsutils dnsutils bind9utils libtool libcdb-dev xmlto dblatex links asciidoc ruby-json ruby-sqlite3 rubygems libcurl4-openssl-dev ruby1.9.1 socat time libzmq1 libzmq-dev pkg-config daemontools authbind liblua5.1-posix1 libopendbx1-dev libopendbx1-sqlite3 python-virtualenv libldap2-dev
 + - sudo apt-get install --no-install-recommends libboost-all-dev libtolua-dev bc libcdb-dev libnet-dns-perl unbound-host ldnsutils dnsutils bind9utils libtool libcdb-dev xmlto links asciidoc ruby-json ruby-sqlite3 rubygems libcurl4-openssl-dev ruby1.9.1 socat time libzmq1 libzmq-dev pkg-config daemontools authbind liblua5.1-posix1 libopendbx1-dev libopendbx1-sqlite3 python-virtualenv libldap2-dev
+  - sudo sh -c 'sed s/precise/trusty/g /etc/apt/sources.list > /etc/apt/sources.list.d/trusty.list'
+  - sudo apt-get update
+  - sudo apt-get install liblmdb0 liblmdb-dev lmdb-utils
   - sudo update-alternatives --set ruby /usr/bin/ruby1.9.1
   - sudo touch /etc/authbind/byport/53
   - sudo chmod 755 /etc/authbind/byport/53
@@@ -21,11 -23,10 +24,11 @@@
   - cd ../..
  script:
   - ./bootstrap
-  - ./configure --with-modules='bind gmysql gpgsql gsqlite3 mydns tinydns remote random opendbx ldap' --enable-unit-tests --enable-remotebackend-http --enable-tools --enable-remotebackend-zeromq
+  - ./configure --with-modules='bind gmysql gpgsql gsqlite3 mydns tinydns remote random opendbx ldap lmdb' --enable-unit-tests --enable-remotebackend-http --enable-tools --enable-remotebackend-zeromq
   - make dist
   - make -j 4
 - - make -j 4 check
 + - travis_retry make -j 4 check # Workaround for remotebackend failures on travis-ci
 + - make -C pdns $(grep '(EXEEXT):' pdns/Makefile | cut -f1 -d\$)
   - cd pdns
   - make -j 4 pdns_recursor
   - ./dist-recursor

diff --cc pdns/docs/pdns.xml
Simple merge