Skip to content

Commit

Permalink
Merge branch 'master' into cloudera-os-build
Browse files Browse the repository at this point in the history
  • Loading branch information
cloudedge committed Mar 20, 2012
2 parents 8b1d63c + 4079155 commit 8278c10
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion barclamps/crowbar
Submodule crowbar updated 3 files
+6 −4 crowbar_framework/app/controllers/support_controller.rb
+18 −1 crowbar_framework/app/views/nodes/list.html.haml
+5 −5 crowbar_framework/app/views/support/import.html.haml

0 comments on commit 8278c10

Please sign in to comment.