Skip to content

Commit

Permalink
Merge branch 'master' into hadoop-os-build
Browse files Browse the repository at this point in the history
  • Loading branch information
cloudedge committed May 23, 2012
2 parents 17576e5 + 9c6bb88 commit cea240a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion barclamps/network
Submodule network updated 3 files
+17 −2 crowbar.yml
+17 −17 crowbar_framework/app/controllers/network_controller.rb
+22 −52 crowbar_framework/app/views/network/nodes.html.haml

0 comments on commit cea240a

Please sign in to comment.