crowbar/barclamp-crowbar — pull request #718 by jtwill98 (2013-10-04 21:28:46+00:00)
Title: Merge of Latest Pebble commits into Roxy [2/13]

The changes here are the latest Pebbles commits into Roxy, thus in essence bring roxy in sync with Pebbles.

bin/blocking_chef_client.sh | 2 +-
bin/looper_chef_client.sh | 13 +--
chef/cookbooks/crowbar/files/default/crowbar | 2 +-
chef/cookbooks/crowbar/files/default/crowbar.suse | 10 ++-
crowbar_framework/app/models/service_object.rb | 94 ++++++++++-----------
5 files changed, 65 insertions(+), 56 deletions(-)

Crowbar-Pull-ID: 17620546f850dd64dddb20c9c812824cc5589804

Crowbar-Release: roxy