Our code currently requires Puppet 3.5.1 or higher by using
Puppet.lookup(), the Rakefile is correct but Gemfile needs to reflect this
Merge pull request #1120 from senior/maint/stable/3-7-1-puppet-version-dependency

Our code currently requires Puppet 3.5.1 or higher by using Puppet.lookup()
update release notes for 2.2.2
Merge pull request #1128 from wkalt/ticket/stable/release-notes-2.2.2

update release notes for 2.2.2
(PDB-965) Update trapperkeeper-jetty9 to 0.9.0

This commit updates our version of tk-jetty9 and updates the documentation to
include some of the new features.
Merge pull request #1130 from wkalt/ticket/master/pdb-965-upgrade-tk

(PDB-965) Update trapperkeeper-jetty9 to 0.9.0
Merge branch 'stable'

* stable:
  update release notes for 2.2.2
  Our code currently requires Puppet 3.5.1 or higher by using Puppet.lookup(), the Rakefile is correct but Gemfile needs to reflect this
(PDB-954) Support a fallback database

This commit moves from a combo 'server' and 'port' config to a
'server_urls' config that contains the full path to one or more PuppetDB
URLs. The old server/port format is still supported (internally it is
converted to a URL to conform with the new syntax).

This commit also supports a new 'server_url_timeout' config. If the
PuppetDB instance has responded in the specified number of
seconds (defaults to 30) it will fail and roll to the next PuppetDB
url (if one is provided).
keep second db off
skdjfh