Skip to content
This repository has been archived by the owner on May 26, 2023. It is now read-only.

Prepare for v1.3.0 (excludes join(), include()) #112

Closed
wants to merge 4 commits into from
Closed

Prepare for v1.3.0 (excludes join(), include()) #112

wants to merge 4 commits into from

Conversation

harto
Copy link
Collaborator

@harto harto commented May 28, 2014

Backs out the addition of join() and include() for a stable 1.3.0 release.
The revert commits will be reverted back onto master.
For comparison with 1.2.1, see v1.2.1...rc-v1.3.0
/cc @lox

harto added 4 commits May 28, 2014 11:13
@harto
Revert "Fixed HasOne and Belongs to mapping for keys with different n…
7ecb3a6 
…ames"

This reverts commit 09170b1.
@harto
Revert "Merge pull request #106 from bjornpost/fix-domainobject-set"
56bcc74 
This reverts commit e0f78a1, reversing
changes made to 9f59f08.
@harto
Revert "Merge pull request #96 from lox/joins"
894e073 
This reverts commit 9f59f08, reversing
changes made to bcc3dbf.

Conflicts:
	lib/Pheasant/Mapper/RowMapper.php
@harto
Update CHANGELOG for 1.3.0 release
d4766f4
@harto harto mentioned this pull request May 28, 2014
Merged
@harto
Copy link
Collaborator Author

harto commented May 28, 2014

Superseded by #113

@harto harto closed this May 28, 2014
@harto harto deleted the rc-v1.3.0 branch May 28, 2014 19:12
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@harto