Merge remote-tracking branch 'upstream/1.6.x'

* upstream/1.6.x:
  (PDB-435) Travis no longer has bundler installed by default, now installing it explicitly
Merge branch '1.6.x'

* 1.6.x:
  (packaging) Replace non-portable shell calls in spec and changelog with ruby
  (packaging) Evaluate rpm spec file just like debian templates
  (packaging) set project to pe-puppetdb when building pe-puppetdb
  (packaging) Fully qualify variables supplied by the packaging repo in templates
  (packaging) Update template task for new erb_file method
  (packaging) Update top-level Rakefile's version and pe determination
Merge pull request #840 from senior/ticket/master/pdb-238-remove-v1

(PDB-238) Remove v1 API
Merge branch '1.6.x'

* 1.6.x:
  Fixed an anonymizer test hidden behind a lazy seq
PDB-177 Replace ssl-host default with 0.0.0.0

By trying to use a hostname, the amount of issues people suffer with during
setup times related to hostname resolution is quite high. This patch
replaces the hostname with 0.0.0.0 which by default listens on all
interfaces.

Signed-off-by: Ken Barber <ken@bob.sh>
PDB-177 Remove superflous fqdn lookups

Now that the ssl-host no longer needs a hostname, we can remove this code
that looks up the fqdn.

Signed-off-by: Ken Barber <ken@bob.sh>
Merge branch '1.6.x' into maint/master/api-cleanup-rollup-from-16x

This commit includes some hand modified changes to remove more :v1 deprecations
since this that original patch was merged. Downstream changes in 1.6.x had
basically added more :v1 knowledge, but the manual changes as a part of this
merge have removed those references and will now throw exceptions for any :v1
version reference.

* 1.6.x:
  PDB-234 Cleanup some minor code duplication and missing versions from case
  PDB-437 Clojure lint cleanups
  PDB-437 Reduce API source code and version inconsistencies

Conflicts:
	src/com/puppetlabs/puppetdb/http/v1/node.clj
	src/com/puppetlabs/puppetdb/http/v1/resources.clj
	src/com/puppetlabs/puppetdb/http/v1/status.clj
	src/com/puppetlabs/puppetdb/http/v2.clj
	src/com/puppetlabs/puppetdb/query.clj
	src/com/puppetlabs/puppetdb/query/facts.clj
	src/com/puppetlabs/puppetdb/query/nodes.clj
	src/com/puppetlabs/puppetdb/query/resources.clj
	test/com/puppetlabs/puppetdb/test/query/resources.clj
Merge pull request #846 from kbarber/maint/master/api-cleanup-rollup-from-16x

Maint/master/api cleanup rollup from 16x
Merge branch '1.6.x'

* 1.6.x:
  Switch curl examples to v3 also
  Change tutorial examples to use v3 API

Conflicts:
	documentation/api/query/tutorial.markdown
Merge pull request #845 from kbarber/ticket/master/PDB-177-ssl-host-meaningful-default

PDB-177 Replace ssl-host default with 0.0.0.0
PDB-342 Use our own JDK repo for JDK 7 testing

Change our acceptance tests so that for Ubuntu 10.04 and Debian 6 we use our
own repository which contains a debian package for JDK 7.

This will allow us to retire the JDK 6 support and still provide testing for
those platforms.

Signed-off-by: Ken Barber <ken@bob.sh>
Merge pull request #850 from senior/maint/1.6.x/fact-names-http-test-merge

(PDB-446) Start in on the merge of v2 and v3 test namespaces
PDB-342 Fix order precedence issue with boolean logic for use_our_jdk test

The use_our_jdk variable was being set to true when it should have been false.
This was because the assignment operator = was taking priority over the 'and'
operator. Wrapping the entire 'and' clause in brackets seems to have solved
this.

Signed-off-by: Ken Barber <ken@bob.sh>
Merge branch '1.6.x'

* 1.6.x:
  Switched fact subquery tests from vector results to sets.
  (PDB-446) Start in on the merge of v2 and v3 test namespaces

Conflicts:
	project.clj
	test/com/puppetlabs/puppetdb/fixtures.clj
Fix merge up mistake

I had missed out a single 'git add' during the last merge-up from 1.6.x.

Signed-off-by: Ken Barber <ken@bob.sh>
Merge pull request #851 from kbarber/ticket/1.6.x/PDB-342-add-make-jpkg-repo-for-old-deb-jdk7-testing

PDB-342 Use our own JDK repo for JDK 7 testing
PDB-342 Ensure we use the correct GPG key for the JDK repo

Signed-off-by: Ken Barber <ken@bob.sh>
Merge pull request #852 from kbarber/ticket/1.6.x/PDB-342-signed-repo

PDB-342 Ensure we use the correct GPG key for the JDK repo
Merge branch '1.6.x'

* 1.6.x:
  PDB-342 Ensure we use the correct GPG key for the JDK repo
  PDB-342 Fix order precedence issue with boolean logic for use_our_jdk test
  PDB-342 Use our own JDK repo for JDK 7 testing
(PDB-88) Fail on JDK version 1.6

Previously we would write to log and standard error a deprecation
warning message. I switched that to continue to log the error, but
then exit immediately.