Allow overriding a service's name
Merge pull request #47 from jsok/service-name-aliasing-fix

Allow overriding a service's name
use versioncmp builtin function to compare versions
fix the test on watch using hiera to specify the version
use newer python for testing/mocking hiera
test on 3.7.0
Merge pull request #49 from jfroche/master

use versioncmp to compare versions
Ignore Gemfile.lock in .gitignore

Gemfile.lock will be built in each environment while the first time
run `bundle install`.
For another reason is 'puppet/indirector/hiera' is not in the puppet
3.4.2 which is current forced in lock file.
Require Bundler.setup to make rspec work

To load rspec-puppet which is downdoaded from github for testing, it
needs require 'bundler/setup' in order to load the bundler path.
Make init_style can be disabled

In case install consul from package, the start up script will be
included in the packaging system. Give an option to disable the
init_style so that user can leverage the start script from package.
Merge pull request #52 from TieWei/make-rake-spec-running

Make rake spec running
Merge pull request #53 from TieWei/init-style-disable-option

Make init_style can be disabled
Add config_defaults hash parameter

Allow sites to specify a baseline set of config items to be applied to
all nodes via config_defaults that can be overridden via hash
merge with config_hash. This doesn't change the current behavior
for users, but allows users running both agents and servers
to consolidate defaults for both roles in a single key instead
of repeating the defaults merely to change a small number of config
options such as server: true and bootstrap_expect on server nodes.
Merge pull request #54 from michaeltchapman/config_default

Add config_defaults hash parameter
Use a sorted json method to produce a service json instead of an erb. Closes #45.
Force config.json to use the new sorted function so it converges
Remove guard. Closes #7
Removed deprecated docs from the readme regarding join_cluster. Closes #56.
Merge branch 'master' of github.com:solarkennedy/puppet-consul into osx

Conflicts:
	manifests/install.pp
Use downcase($::kernel) instead of a case on $::operatingsystem to determine which release of consul to download.