version bump submodule
version bump
Merge branch 'havana' of github.com:rcbops-cookbooks/monit

Conflicts:
	metadata.rb
merge conflict
add remove primitives to the resources
Merge pull request #30 from rackerjoe/master

Merged automatically by jenkins after successful build test
Disable service reload for RHEL

Chef attempts to restart the monit service using the reload command but
it's not supported on RHEL. Tweak supports to be platform_family aware.

Fixes rcbops/chef-cookbooks#669
Merge pull request #31 from claco/issue-669

Merged automatically by jenkins after successful build test
Change to :delayed restarts for procmon resource

We're seeing a lot of monit service restarts on a typical OepnStack/HA
deployment. These have been set to :immediately since the inception of
this cookbook.

- Change :immediately to :delayed for monit service notification in
  procmon
Merge pull request #32 from claco/delayed-restarts

Merged automatically by jenkins after successful build test
Sort array to avoid restarts
Merge pull request #33 from claco/sort-template-output

Merged automatically by jenkins after successful build test
Disable web server by default and make it enabled by attribute

(cherry picked from commit 429f73584a9dd849e2a0753f67f5e8a474e18786)
Signed-off-by: Christopher H. Laco <claco@chrislaco.com>
Lock down the http interface a little more

The original PR was to enable/disable the http support to narrow the
attack surface, with a default of false (not enabled). The http support
is required for the command line utility, which is uses in the current
gating process.

As a compromise, we'll enable http to enable the command line but lock
down the binding/allowed addresses to localhost by default.

Fixes rcbops/chef-cookbooks#609
Merge pull request #34 from claco/http-optional

Merged automatically by jenkins after successful build test
Merge remote-tracking branch 'dangerzone/master' into v4.1.3rc
Update VERSION