-
Notifications
You must be signed in to change notification settings - Fork 225
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
(maint) Merge 2.3.1 into master (fact paths, etc.) #1331
Merged
kbarber
merged 19 commits into
puppetlabs:master
from
rbrw:ticket/master/merge-2.3.1-fact-paths-etc
Mar 31, 2015
Merged
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
53210f6
(maint) applied-migrations: don't ignore exceptions
rbrw 9c59032
(PDB-1307) Update to tk-jetty 1.3.0
113206f
(docs) Add .html suffixes to 2.3.0 release notes
kbarber f7604f0
(PDB-1342) Fix trusted facts fallback
ec9aec8
Merge pull request #1327 from mullr/ticket/stable/pdb-1307-update-tk-…
rbrw 11e6511
Merge pull request #1320 from rbrw/ticket/stable/get-applied-migratio…
7407872
Merge pull request #1326 from mullr/ticket/stable/pdb-1342-fix-truste…
kbarber 6804e75
(docs) Replace Checkin with Check In
juniorsysadmin f570d3d
Merge branch 'checkin-typo' into stable
kbarber dbb9f71
(PDB-1031) Fix query engine, v3 endpoints for fact_path move
d5cbad2
(PDB-1031) Accommodate move of fact paths to facts
rbrw 7531aa5
(PDB-1031) Speed migration with unique facts table
0b4e92e
(PDB-1031) Reproduce the fact paths constraint issue
dd21714
(PDB-1031) Verify gc behavior in update race test
rbrw dda38b6
Merge pull request #1296 from rbrw/ticket/stable/pdb-1226-global-inc-gc
wkalt a97ecf2
(PDB-1328) Add preliminary 2.3.1 release notes
rbrw 79fab2f
(PDB-1328) Add contributors to and edit release notes
63660a2
Merge pull request #1330 from ajroetker/ticket/stable/pdb-1328-2.3.1-…
senior c86e1b4
(maint) Merge 2.3.1 into master (fact paths, etc.)
rbrw File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@rlb does this need to go?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@wkalt perhaps not, that's a placeholder (already) in master, though I think we may eventually want to move it back up near the top where we normally put the contributors?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
leave it, pre-existing & out of scope.