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.

Sign up for GitHub

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

Jump to bottom

Merge nest-dev branch into master #539

Merged
merged 22 commits into from
Nov 21, 2017
Merged

Merge nest-dev branch into master #539

merged 22 commits into from
Nov 21, 2017

Conversation

apdavison
Copy link
Member

due to release of NEST 2.14.0

apdavison and others added 21 commits March 9, 2017 09:42
@apdavison
Return nest-dev to testing against NEST master
aa0e209
@appukuttan-shailesh
Brian recording implemented
db06ff3
@appukuttan-shailesh
Neuron recording implemented
2421a1a
@appukuttan-shailesh
Nest recording implemented
cccb2ce
@appukuttan-shailesh
Added test for issue NeuralEnsemble#465, NeuralEnsemble#474
a871d3c
@appukuttan-shailesh
Updates test for issue NeuralEnsemble#445
dbbf075
@appukuttan-shailesh
Small update to test for issue NeuralEnsemble#465, NeuralEnsemble#474
bc5726d
@appukuttan-shailesh
Debug test issue_465_474()
46c4fa9
@appukuttan-shailesh
Debug test issue_465_474() - Py3
68cea4b
@appukuttan-shailesh
Undo test issue_465_474() debug changes
ae9221f
@appukuttan-shailesh
Debug test issue_465_474() - Py3
8bfbd63
@appukuttan-shailesh
Updates NEST install script for Travis
5994171
@appukuttan-shailesh
Updates NEST install script for Travis
4123e90
@appukuttan-shailesh
Updates NEST install script for Travis
6875aca
@appukuttan-shailesh
Updates NEST install script for Travis - diff between master and nest…
72f92e1 
…-dev
@appukuttan-shailesh
Undo test issue_465_474() debug changes
34ea9e6
@apdavison
Merge pull request NeuralEnsemble#501 from appukuttan-shailesh/issue_474
56d28f7 
Issue 474: Implements current recording from electrodes
@apdavison
Merge branch 'nest-dev' of github.com:NeuralEnsemble/PyNN into nest-dev
0fe65e5 
# Conflicts:
#	ci/install_nest.sh
@apdavison
Update NEST installation script on Travis CI
04ad416
@apdavison
Merge 'master' into 'nest-dev'
bd3b22d
@apdavison
Enabled test issue497()
d970622
@apdavison apdavison added this to the 0.9.2 milestone Nov 21, 2017
@apdavison apdavison added the NEST label Nov 21, 2017
@coveralls
Copy link

Coverage Status

Coverage increased (+0.02%) to 54.203% when pulling c5ca823 on apdavison:nest-dev into 35fd89f on NeuralEnsemble:master.

1 similar comment
@coveralls
Copy link

Coverage Status

Coverage increased (+0.02%) to 54.203% when pulling c5ca823 on apdavison:nest-dev into 35fd89f on NeuralEnsemble:master.

@apdavison apdavison merged commit da37e6b into NeuralEnsemble:master Nov 21, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
NEST
Projects
None yet
Milestone
0.9.2
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@apdavison @coveralls @appukuttan-shailesh