Skip to content

(maint) rollup 2.3.x to stable#1552

Merged
kbarber merged 16 commits intopuppetlabs:stablefrom
mullr:maint/stable/rollup-2.3.x-to-stable
Jul 21, 2015
Merged

(maint) rollup 2.3.x to stable#1552
kbarber merged 16 commits intopuppetlabs:stablefrom
mullr:maint/stable/rollup-2.3.x-to-stable

Conversation

@mullr
Copy link
Contributor

@mullr mullr commented Jul 20, 2015

No description provided.

Andrew Roetker and others added 16 commits July 10, 2015 12:41
This commit upgrades PuppetDB to use v5 of the PuppetDB module (latest
at the time of this commit). This consists of using the new `globals`
class to specify the PuppetDB version.
…rsion_5_of_pdb_module

(PDB-1750) Upgrade to v5 of the PuppetDB module
This removes some old code that seems unneccessary with the recent module
changes. Previously we were doing some special stuff for el5 to install postgres 8.4,
but with the 5.0 module this results in two declarations of the Postgresql class.
…el5-postgres

(maint) remove add_el5_postgres?
Missed this one in the previous patch.
…el5-postgres-84

(PDB-1787) remove remaining call to add_el5_postgres
Use 'git describe' to find the most recent released version and use that
to find the base version to install for upgrade tests.
…m-specific-version

(maint) Fix upgrade tests
…sion-symbol-to-string

Coerce version symbols to strings
This updates our release notes for 2.3.6
…pdate-2.3.6-release-notes

(PDB-1682) update release notes for 2.3.6
The command consumer worker threads don't currently apply the
max-frame-size parameter, so the AMQ default of 100MB is used.
…-frame-size-param

(PDB-700) Apply max-frame-size to consumer
@mullr mullr force-pushed the maint/stable/rollup-2.3.x-to-stable branch from 461a281 to aecbc5d Compare July 20, 2015 21:11
@pljenkinsro
Copy link

Test FAILed.
Refer to this link for build results (access rights to CI server needed):
https://jenkins.puppetlabs.com/job/platform_puppetdb_intn-sys_pr/1676/

@pljenkinsro
Copy link

Test FAILed.
Refer to this link for build results (access rights to CI server needed):
https://jenkins.puppetlabs.com/job/platform_puppetdb_intn-sys_pr/1675/

@mullr
Copy link
Contributor Author

mullr commented Jul 20, 2015

↑↑↑ not a real failure ↑↑↑
Just a spurious failure on one platform; I don't think we should worry about it.

kbarber added a commit that referenced this pull request Jul 21, 2015
@kbarber kbarber merged commit c0be215 into puppetlabs:stable Jul 21, 2015
@kbarber kbarber added this to the 3.0.2 (stable) milestone Jul 31, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants