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

ClearSight merge #69

Merged
merged 6 commits into from Apr 17, 2013
Merged

ClearSight merge #69

merged 6 commits into from Apr 17, 2013

Conversation

jamonholmgren
Copy link
Collaborator

I did a ton of work making sure that everything worked well together (several hours worth). I have decent coverage on the tests and they pass in under two seconds.

I think it's good to merge. The main feature additions are the batch save/delete and chunking parts plus the date and upload features work better.

This was referenced Apr 17, 2013
@jamonholmgren
Copy link
Collaborator Author

Looks like I'm having a couple test fail on Travis.ci. It works locally. I'll have to fix tomorrow.

@jamonholmgren
Copy link
Collaborator Author

The tests pass now with flying colors (and take less than 2 seconds on my machine, by the way). :)

Waiting on @adelevie's approval.

@jamonholmgren
Copy link
Collaborator Author

We should probably increment the version number. I would recommend 1.8.0.

adelevie added a commit that referenced this pull request Apr 17, 2013
@adelevie adelevie merged commit 1373cf8 into master Apr 17, 2013
@jamonholmgren
Copy link
Collaborator Author

Thanks Alan!

@jamonholmgren jamonholmgren deleted the clearsight_merge branch April 17, 2013 20:10
@adelevie
Copy link
Owner

!!!

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.

None yet

2 participants