V2.0 merge #119
Merged
V2.0 merge #119
Conversation
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
Pressure rename
Get end-to-end tests working again
This reverts commit cc6f201.
Revert "change fan route params to 'rpm' and 'percent'"
update the 2.0 API doc
make all timestamps rfc3339 formatted
add newline at end of JSON response when pretty printing
fix bug with socket lookup
update deps so tests pass
add more validation against request query params
…into led-api-change
update synse server led api to make blink an led power state
Update fan_sensors route for auto fan.
KylerBurke
approved these changes
Apr 5, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Review Deadline: --
Summary
merges master into v2.0-dev so that v2.0-dev can be merged into master and become the actual active branch
this bit of git indirection is because the 2.0 branch didn't share commit history with master, so by merging master in, we get its commit history. I don't think this warrants a review (700 files changed...) - it should just effectively make v2.0-dev master.
built, ran, tested, and linted locally and it looks like everything is happy.