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

Demo comms merge #121

Closed
wants to merge 41 commits into from
Closed

Demo comms merge #121

wants to merge 41 commits into from

Commits on Jun 26, 2015

  1. Update central and platform agent to allow peer publishing 

    as per #111
    @jhaack
    jhaack committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    1a9c06a View commit details
    Browse the repository at this point in the history

  2. Start agent this time #111

    @jhaack
    jhaack committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    fb8ca07 View commit details
    Browse the repository at this point in the history

  3. Fixed manager call #111

    @jhaack
    jhaack committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    9b48e18 View commit details
    Browse the repository at this point in the history

  4. Debugging

    @jhaack
    jhaack committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    72fd329 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2015

  1. Fixed gevent issues

    @jhaack
    jhaack committed Jun 27, 2015
    Configuration menu
    Copy the full SHA
    4d502b3 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2015

  1. Moved some of the scripts to an upper level scripts that is out of the 

    root volttron folder.
    @craig8
    craig8 committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    466020f View commit details
    Browse the repository at this point in the history

  2. Added modifications to webserver.py.

    @craig8
    craig8 committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    d5082a8 View commit details
    Browse the repository at this point in the history

  3. Added VIP agent

    @jhaack
    jhaack committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    e2b4478 View commit details
    Browse the repository at this point in the history

  4. Adding id to message

    @jhaack
    jhaack committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    267d7e5 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2015

  1. Debugging

    @jhaack
    jhaack committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    80ec489 View commit details
    Browse the repository at this point in the history

  2. Debugging

    @jhaack
    jhaack committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    1c48bd6 View commit details
    Browse the repository at this point in the history

  3. Debug

    @jhaack
    jhaack committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    addc299 View commit details
    Browse the repository at this point in the history

  4. Debug

    @jhaack
    jhaack committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    37183dc View commit details
    Browse the repository at this point in the history

  5. Handling the formatting error in utils.py

    @jhaack
    jhaack committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    201aecd View commit details
    Browse the repository at this point in the history

  6. Trying to fix issue where VC cannot reply to remote PlatformAgent

    @jhaack
    jhaack committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    310143f View commit details
    Browse the repository at this point in the history

  7. Merged from master.

    @craig8
    craig8 committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    bd8b576 View commit details
    Browse the repository at this point in the history

  8. Added logging to the webserver.py through websockets /log

    @craig8
    craig8 committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    b671eb9 View commit details
    Browse the repository at this point in the history

  9. Merge vip and platform agents.

    @craig8
    craig8 committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    192544d View commit details
    Browse the repository at this point in the history

  10. Added better handling of starting demo

    @craig8
    craig8 committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    5416e41 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' into demo-comms

    @craig8
    craig8 committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    87fc4c1 View commit details
    Browse the repository at this point in the history

  12. Added caching of sessions to allow easier debugging.

    @craig8
    craig8 committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    b53f828 View commit details
    Browse the repository at this point in the history

  13. Passing back record

    @jhaack
    jhaack committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    5fbd00c View commit details
    Browse the repository at this point in the history

  14. Fixed merge issue.

    @craig8
    craig8 committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    521290c View commit details
    Browse the repository at this point in the history

  15. Merge branch 'demo-comms' of https://github.com/VOLTTRON/volttron int… 

    …o demo-comms
    @craig8
    craig8 committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    52e99dd View commit details
    Browse the repository at this point in the history

  16. Merge branch 'master' into demo-comms

    @craig8
    craig8 committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    db513e4 View commit details
    Browse the repository at this point in the history

  17. Debugging rpc method

    @jhaack
    jhaack committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    77e9969 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'demo-comms' of https://github.com/VOLTTRON/volttron int… 

    …o demo-comms
    @jhaack
    jhaack committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    a940997 View commit details
    Browse the repository at this point in the history

  19. Deal with error in listener on message

    @jhaack
    jhaack committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    8697294 View commit details
    Browse the repository at this point in the history

  20. Useful name in listener

    @jhaack
    jhaack committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    1f4824f View commit details
    Browse the repository at this point in the history

  21. Send back external address

    @jhaack
    jhaack committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    19be28a View commit details
    Browse the repository at this point in the history

  22. Send back external address

    @jhaack
    jhaack committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    67b1246 View commit details
    Browse the repository at this point in the history

  23. Merge branch 'master' into demo-comms

    @jhaack
    jhaack committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    9905809 View commit details
    Browse the repository at this point in the history

  24. Fixed bad print

    @jhaack
    jhaack committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    a0fe869 View commit details
    Browse the repository at this point in the history

  25. Get id from config file

    @jhaack
    jhaack committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    20bd110 View commit details
    Browse the repository at this point in the history

  26. hardcoded central address for now

    @jhaack
    jhaack committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    197c5ea View commit details
    Browse the repository at this point in the history

  27. fix path on script

    @jhaack
    jhaack committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    4a2629f View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2015

  1. Merge branch 'master' into demo-comms

    @jhaack
    jhaack committed Jul 10, 2015
    Configuration menu
    Copy the full SHA
    fb1bb00 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into demo-comms

    @jhaack
    jhaack committed Jul 10, 2015
    Configuration menu
    Copy the full SHA
    a346dc6 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2015

  1. Merge branch 'master' into demo-comms

    @jhaack
    jhaack committed Jul 14, 2015
    Configuration menu
    Copy the full SHA
    a6612e8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into demo-comms

    @jhaack
    jhaack committed Jul 14, 2015
    Configuration menu
    Copy the full SHA
    78a72d2 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2015

  1. Took out hardcoding

    @jhaack
    jhaack committed Jul 20, 2015
    Configuration menu
    Copy the full SHA
    45dc481 View commit details
    Browse the repository at this point in the history