Skip to content
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

Fix #2582 - Backport ability to log user and date to 1.6 #2627

Merged
merged 1 commit into from
Nov 16, 2016

Conversation

juliensam
Copy link
Contributor

No description provided.

return get_class(
str(layer.geo_table),
exclude_properties=layer.exclude_properties
exclude_properties=','.join(exclude)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please use double quotes: exclude_properties=",".join(exclude) (travis error)

@juliensam
Copy link
Contributor Author

I'm not sure what coveralls test. Which tests (6?) are failing?

@fredj
Copy link
Member

fredj commented Nov 4, 2016

@sbrunner can we ignore the coveralls test? I yes, I think it's good to merge.

@juliensam
Copy link
Contributor Author

I'll wait for @sbrunner feedback before merging.

@sbrunner
Copy link
Member

sbrunner commented Nov 7, 2016

@juliensam can you fix the author on the two first commits?

this 4b6199b should also be backported :-)

Finally can you merge all the commits in one commit?

@juliensam juliensam force-pushed the log_last_update_1_6 branch 2 times, most recently from 9299212 to 3fe507f Compare November 16, 2016 00:13
@juliensam
Copy link
Contributor Author

Commit squashed and the layer tests now pass. It seems that Travis is raising a few errors in other parts of the code. I suggest to fix those in another pull request.

In short, ready to review.

@sbrunner
Copy link
Member

#2640 should fix the Travis failure, can you do rebase?

@juliensam
Copy link
Contributor Author

Ready to review

@sbrunner sbrunner merged commit 9320a7d into camptocamp:1.6 Nov 16, 2016
@sbrunner
Copy link
Member

Thanks :-)

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.

4 participants