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

Implement x_netkan_override #1197

Merged
merged 4 commits into from
Jun 28, 2015
Merged

Implement x_netkan_override #1197

merged 4 commits into from
Jun 28, 2015

Conversation

pjf
Copy link
Member

@pjf pjf commented Jun 27, 2015

This PR implements the x_netkan_override syntax described in #1160.

Includes test cases. Tested on live data.

Closes #1160 and brings in a new age of prosperity. :)

pjf added 4 commits June 27, 2015 19:51
…_override

* origin/master:
  Renamed the Delete Button to Forget Closes #1194
  Reformat TestCase attributes
  Remove netkan specific properties from metadata
  Correctly print relationship versions
@pjf
Copy link
Member Author

pjf commented Jun 27, 2015

Wishing @Dazpoet to see this, because I'm pretty sure it's the sort of thing Daz would like. :)

pjf added a commit to pjf/NetKAN that referenced this pull request Jun 27, 2015
This requires KSP-CKAN/CKAN#1197 to be merged to actually function,
but can be safely be merged before then (as `x_netkan_override` is
ignored in the current netkan build).

Part of KSP-CKAN/CKAN#1184.
@pjf
Copy link
Member Author

pjf commented Jun 28, 2015

Also looking hopefully at @dbent for review and merge (if appropriate), as @dbent is the mastermind behind the override syntax. :)

@dbent
Copy link
Member

dbent commented Jun 28, 2015

👍 🍭

dbent added a commit that referenced this pull request Jun 28, 2015
@dbent dbent merged commit 2a40b7b into master Jun 28, 2015
@dbent dbent deleted the 1160_netkan_version_override branch June 28, 2015 01:03
@pjf pjf removed the Pull request label Jun 28, 2015
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