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: puppetlabs/puppetlabs-puppetdb
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.0
Choose a base ref
...
head repository: puppetlabs/puppetlabs-puppetdb
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.0.1
Choose a head ref
  • 9 commits
  • 14 files changed
  • 2 contributors

Commits on Sep 19, 2012

  1. Fix invalid subname in database.ini 

    For the postgres subname, the module was writing the wrong value
for the database instance name.  This commit fixes that bug.
    @cprice404
    cprice404 committed Sep 19, 2012
    Configuration menu
    Copy the full SHA
    be683b7 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2012

  1. complies with style guide

    Garrett Honeycutt committed Sep 20, 2012
    Configuration menu
    Copy the full SHA
    1aab5d9 View commit details
    Browse the repository at this point in the history

  2. Update CHANGELOG and Modulefile

    @cprice404
    cprice404 committed Sep 20, 2012
    Configuration menu
    Copy the full SHA
    7c81036 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #6 from cprice-puppet/bug/master/db_ini_wrong_db_name 

    Bug/master/db ini wrong db name
    @cprice404
    cprice404 committed Sep 20, 2012
    Configuration menu
    Copy the full SHA
    35dbe3f View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'ghoneycutt/ticket/1.0.x/xxxx_style_upda… 

    …tes' into maint/master/resolve-merge-conflict

Conflicts:
	manifests/server/database_ini.pp
    @cprice404
    cprice404 committed Sep 20, 2012
    Configuration menu
    Copy the full SHA
    4360004 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #7 from cprice-puppet/maint/master/resolve-merge-c… 

    …onflict

Maint/master/resolve merge conflict
    @cprice404
    cprice404 committed Sep 20, 2012
    Configuration menu
    Copy the full SHA
    dbc38b0 View commit details
    Browse the repository at this point in the history

  6. Fix duplicate stanza in database_ini.pp 

    There was a minor problem with a merge conflict in the previous
commit.  This commit should fix it.
    @cprice404
    cprice404 committed Sep 20, 2012
    Configuration menu
    Copy the full SHA
    a65afcc View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2012

  1. Merge pull request #8 from cprice-puppet/bug/master/dupe_in_db_ini 

    Fix duplicate stanza in database_ini.pp
    @cprice404
    cprice404 committed Sep 21, 2012
    Configuration menu
    Copy the full SHA
    bbd1f30 View commit details
    Browse the repository at this point in the history

  2. Updated CHANGELOG - final commit for 1.0.1 release

    @cprice404
    cprice404 committed Sep 21, 2012
    Configuration menu
    Copy the full SHA
    79f9190 View commit details
    Browse the repository at this point in the history
Loading