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.3
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.1.0
Choose a head ref
  • 15 commits
  • 13 files changed
  • 3 contributors

Commits on Sep 28, 2012

  1. Configuration menu
    Copy the full SHA
    df6f7cc View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2012

  1. Configuration menu
    Copy the full SHA
    850e039 View commit details
    Browse the repository at this point in the history
  2. Update comments and docs w/rt PE params

    This is just a small add-on to Hunter's commits where he added
    extra parameters to support PE.  This commit just cleans up
    some of my old comments that were made irrelevant or inaccurate
    due to the work that he did, and adds a bit of documentation to
    the new test manifest that he created.
    cprice404 committed Oct 1, 2012
    Configuration menu
    Copy the full SHA
    b5df5d9 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #11 from cprice-puppet/feature/master/params-for-pe

    Add parameters to enable usage of enterprise versions of PuppetDB
    cprice404 committed Oct 1, 2012
    Configuration menu
    Copy the full SHA
    7dde8c3 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a598edc View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    63f1c52 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #14 from hunner/pe_puppetdb_master

    Add example manifest code for pe puppet master
    cprice404 committed Oct 1, 2012
    Configuration menu
    Copy the full SHA
    4d0154d View commit details
    Browse the repository at this point in the history
  7. Merge pull request #15 from hunner/add_pe_param_detection

    Add condition to detect PE installations and provide different parameters
    cprice404 committed Oct 1, 2012
    Configuration menu
    Copy the full SHA
    75532a0 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2012

  1. Make puppetdb startup timeout configurable

    In some environments, puppetdb can take longer than 10 seconds
    to start up.  Prior to this commit, that value was hard coded
    and the module would sometimes fail when it wouldn't have failed
    with a slightly larger timeout.  This commit makes the timeout
    configurable, and also increases the default value to 15 seconds.
    cprice404 committed Oct 17, 2012
    Configuration menu
    Copy the full SHA
    783b595 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #18 from cprice-puppet/feature/master/configurable…

    …-puppetdb-startup-timeout
    
    Make puppetdb startup timeout configurable
    cprice404 committed Oct 17, 2012
    Configuration menu
    Copy the full SHA
    d1cd651 View commit details
    Browse the repository at this point in the history
  3. Update manifests/master/config.pp

    This just incorporates some whitespace / compatibility issues that @hunner noticed in the last pull request.
    cprice404 committed Oct 17, 2012
    Configuration menu
    Copy the full SHA
    b119a30 View commit details
    Browse the repository at this point in the history
  4. Fix embedded db setup in Puppet Enterprise

    The subname value in database.ini when using an embedded database varies
    between the Puppet Enterprise package and the FOSS Puppet package.
    Previously, the PuppetDB module could not successfully manage an
    embedded database on a PE master. This commit adds an additional
    parameter and utilization to account for this.
    reidmv committed Oct 17, 2012
    Configuration menu
    Copy the full SHA
    bf0ab45 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #19 from reidmv/fix/master/pe_subname

    Fix embedded db setup in Puppet Enterprise
    cprice404 committed Oct 17, 2012
    Configuration menu
    Copy the full SHA
    a0c1ce2 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2012

  1. Update Modulefile

    * Update the version number to 1.1.0
    * Update the postgres dependency to puppetlabs/postgresql
    cprice404 committed Oct 25, 2012
    Configuration menu
    Copy the full SHA
    bea79b4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4c9a7cf View commit details
    Browse the repository at this point in the history
Loading