commit b840820
Merge: 4668ea2 ce63c55
Author: Alex Seeholzer <seeholzer@gmail.com>
Date:   Tue Nov 3 15:53:36 2015 +0100

    Merge branch 'master' into issue-parrot_neuron-multiplicity

    * master:

commit 4668ea2
Author: Alex Seeholzer <seeholzer@gmail.com>
Date:   Tue Nov 3 15:29:13 2015 +0100

    Updated tests to conform to changes in parrot-multipart branch;

commit 1b8ddac
Merge: bce4bf9 9c4c2f3
Author: Alex Seeholzer <seeholzer@gmail.com>
Date:   Tue Nov 3 15:27:01 2015 +0100

    Merge branch 'parrot-multiport' into issue-parrot_neuron-multiplicity

    * parrot-multiport:
      removed unnecessary variables gid_source and gid_parrot;

commit bce4bf9
Merge: ef31ab0 3d8da20
Author: Alex Seeholzer <seeholzer@gmail.com>
Date:   Tue Nov 3 13:20:45 2015 +0100

    Merge branch 'parrot-multiport' into issue-parrot_neuron-multiplicity

    * parrot-multiport:
      Added tests for STDP protocols between parrot neurons to potentiate and depress connection; Accounted for delays in simulation times; Addresses https://github.com/nest/nest-simulator/pull/118/files#r43736299 and https://github.com/nest/nest-simulator/pull/118/files#r43702948; Fixes https://github.com/nest/nest-simulator/pull/118/files#r43702538 and nest#118 (comment);
      Import GetStatus/SetStatus from the info component, where they were moved in a3ec4d4.
      Fix the stop condition of process_static_analysis.
      Added explanation for recursive import code.
      Moved Get/SetStatus from node to info component of HL API.
      Added information on steps to execute after creating the release tarball.
      Validate parameter values in setters of tsodyks synapses
      Added empty __init__.py to make the lib directory a module.
      Split Python high-level API into multiple files and made loading of the submodules dynamic
      Tsodyks synapse model with common properties

commit ef31ab0
Merge: ca70656 9425619
Author: Alex Seeholzer <seeholzer@gmail.com>
Date:   Tue Nov 3 10:19:25 2015 +0100

    Merge branch 'parrot-multiport' into issue-parrot_neuron-multiplicity

    * parrot-multiport:

commit ca70656
Merge: 48a9feb c80a8be
Author: Alex Seeholzer <seeholzer@gmail.com>
Date:   Tue Nov 3 10:18:11 2015 +0100

    Merge branch 'master' into issue-parrot_neuron-multiplicity

    * master:
      Apply @lekshmideepu suggestions
      Filter out empty entries in changed files
      some cleanup
      Modify travis.yml
      Implemented two fixes for the K computer:
      Print status about uploading to S3
      Remove cppcheck files after static analysis.
      Adjust comment and have starting and ending line at summary
      Correct copyright header.
      Add a script to parse travis log and give a nice summary.
      Removed superfluous and outdated files

commit 48a9feb
Merge: 0b96cd1 4d939e5
Author: Alex Seeholzer <seeholzer@gmail.com>
Date:   Mon Oct 19 10:14:01 2015 +0200

    Merge branch 'parrot-multiport' into issue-parrot_neuron-multiplicity

    * parrot-multiport:
      Added superclass (archiving_node) get_status to parrot_neuron;

commit 0b96cd1
Author: Alex Seeholzer <seeholzer@gmail.com>
Date:   Fri Oct 16 16:08:11 2015 +0200

    added test for parrot neuron multiplicity.

commit ff0cb6d
Author: Alex Seeholzer <seeholzer@gmail.com>
Date:   Fri Oct 16 15:39:45 2015 +0200

    Changed parrot neuron to emit multiple spikes via spike multiplicity instead of a loop; Addresses nest#82

…-squashed

Revised documentation of parrot_neuron and added one more test.

* master:
  Use NewConnect instead of DivergentConnect and remove non-default weight in favor of higher rate.
  Fixed error message and reporting in case CSA is not available.
  Make wording more consistent with respect to active and passive speech.
  improvements as discussed in PR nest#127
  Added reference
  Updated CSA examples to new documentation guidelines.
  Replace NAN, std::isnan by numerics::nan, numerics::isnan