Permalink
Browse files

Merge pull request #18 from galthaus/pull-req-release-rails3anddb-mas…

…ter-38d399e6f0

Tweak Daves fix for object initialization and fix some linux file format issues [6/29]
  • Loading branch information...
2 parents 28b2a36 + 38d399e commit 3bb8a0a60067365eb8eac7faf3b77477c14020e7 @galthaus committed Aug 3, 2012
Showing with 25 additions and 24 deletions.
  1. +25 −24 crowbar_framework/app/controllers/ipmi_controller.rb
@@ -1,24 +1,25 @@
-# Copyright 2011, Dell
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-class IpmiController < BarclampController
- before_filter :set_service_object
-
- def set_service_object
- @service_object = IpmiService.new logger
- end
-
- private :set_service_object
-end
+# Copyright 2011, Dell
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+class IpmiController < BarclampController
+ before_filter :set_service_object
+
+ def set_service_object
+ @service_object = IpmiService.new logger
+ @service_object.bc_name = @bc_name
+ end
+
+ private :set_service_object
+end

0 comments on commit 3bb8a0a

Please sign in to comment.