Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: stackforge/puppet-openstack
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: stackforge/puppet-openstack
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: folsom
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 7 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 2, 2012

  1. Merge pull request #123 from puppetlabs/master 

    merge master into folsom
    @bodepd
    bodepd committed Nov 2, 2012
    Configuration menu
    Copy the full SHA
    af0bbb0 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2012

  1. * Update example/site.pp, as reference to https://github.com/puppetla… 

    …bs/puppetlabs-openstack_dev_env.

* Tested with multi-node mode + cinder.
* TODO: Test all-in-one mode.
* TODO: Test quantum.
    @hswong3i
    hswong3i committed Nov 7, 2012
    Configuration menu
    Copy the full SHA
    b2254ee View commit details
    Browse the repository at this point in the history

  2. Merge pull request #125 from hswong3i/folsom 

    Update example/site.pp for Folsom
    @bodepd
    bodepd committed Nov 7, 2012
    Configuration menu
    Copy the full SHA
    546de92 View commit details
    Browse the repository at this point in the history

  3. * Tested with all-in-one mode.

    @hswong3i
    hswong3i committed Nov 7, 2012
    Configuration menu
    Copy the full SHA
    bdeb518 View commit details
    Browse the repository at this point in the history

  4. * Add URL for installation example.

    @hswong3i
    hswong3i committed Nov 7, 2012
    Configuration menu
    Copy the full SHA
    6eeaa6e View commit details
    Browse the repository at this point in the history

  5. Merge pull request #126 from hswong3i/folsom 

    * Tested with all-in-one mode.
    @bodepd
    bodepd committed Nov 7, 2012
    Configuration menu
    Copy the full SHA
    4353d18 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2012

  1. Merge pull request #139 from puppetlabs/master 

    merge folsom changes from master
    @bodepd
    bodepd committed Nov 14, 2012
    Configuration menu
    Copy the full SHA
    c186702 View commit details
    Browse the repository at this point in the history
Loading