Fix warnings for unused variable.
Merge pull request #109 from galthaus/pull-req-master-e4517a40898eab087212433a7dea764948978fc6

sets of changes and unit tests that seem to get nova running somewhat [2/6]
[Ruby 1.9] Fix broken ip_range unit tests

`assert` is incorrectly used here, since it just tests that the first
argument is `true`, which in Ruby means _any_ object (eg. 0, 1, "", [],
{}) except `false` and `nil`.

Ruby 1.9 is stricter here and checks that the second argument is a
`String` or `Proc`, thus uncovering the bug/typo. `assert_equal` should
be used here instead.
Merge pull request #110 from jamestyj/jamestyj-ip-range-model-test

[Ruby 1.9] Fix broken ip_range unit tests
locate the new network proposal template based on relative path to the Rails app root location
Merge pull request #111 from aabes/pull-req-master-225b7f536ac55cb9ef75c704a50999f331e1a1a3

This looks fine - I'm going accepting the pull and will test as part of my other integration testing.
Checkpoint: basic network view controllers and network active scaffold config
Checkpoint: basic network view controllers and network active scaffold config
Added allocate/deallocate API for crowbar 2.0 w/changes from code review
Merge pull request #113 from cdearborn/pull-req-master-b7222f4a3a627ff940c8bb813a5a647f48c8f952

I’ve reviewed Chris’ pull and it looks fine.  I can build and install an ISO.

Some of the tests are not passing for me.  Rather than keep trying to tweak them, I’m going to accept the pull and fix the tests I can with my next pull request.  I cannot tell right now if it’s me or the pull.

It’s possible that some of the tests will remain broken until Chris can look at them.
Only run network BDD tests when in interactive mode.
Merge pull request #114 from cdearborn/pull-req-master-f726823a085b0bc142f38605a27259ba5843d690

Only run network BDD tests in interactive mode [2/2]
Only run network BDD tests when in interactive mode.
Adding in support for distributed locking for allocated ips.
Handle nil or "" as the proposal_id
Merge pull request #115 from cdearborn/pull-req-master-2941eb4a3ef165dddf0039cf260f5b0acdce2d9d

I'm taking this pull in advance of the jig and docs move merges.
move docs and BDD
Merge pull request #117 from cloudedge/pull-req-master-8fd3f586f8e29b7bf0af886ccc15be0e9c3290e1

Merged by devtool for cloudedge
Merge pull request #118 from cdearborn/pull-req-master-63dfe3a3c387afc82552207b7258fc5a376b93bc

Merged by devtool for aabes
fix unless to be while
Merge pull request #119 from cloudedge/pull-req-master-a5cef33661485f12205db574632537726a51de3b

Barclamp View fix (Trello 73) [2/2]