[Opengeoscience-developers] OpenGeoscience branch, next, updated. 00b167e39d3f512b071286679f032758b9c93c92

[Ben Burnett]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenGeoscience".

The branch, next has been updated
       via  00b167e39d3f512b071286679f032758b9c93c92 (commit)
       via  4fd8658841dc7d52f11b55cc7f8ff5648c6835f5 (commit)
       via  1c01056d50573613ad5a35dd7196f41745480779 (commit)
       via  303caca17e38e50601c8b93b9e4baba7251d1fa5 (commit)
       via  267cde06f21f9af0b99762c5d1b9616cf527d284 (commit)
       via  12f54d400e1da221654891eb18e30d2999aa0134 (commit)
       via  94a8ed6c8c74d72b836e3e8acf8715200d25a13f (commit)
       via  65e7638c84384fd1e965058de03afe7f14109d25 (commit)
       via  ae15989a51353c066c3764882c36ea6276405a80 (commit)
       via  ad2013402b0f8a47dd2e9c453dfbacfae72062ca (commit)
       via  fc1762bb1868f5c85677091cb9cb5c78492df2f9 (commit)
       via  665da8b6da1bf062485d19bd12caaf5adda29a69 (commit)
       via  c44ebbc70f0a726382d3e6dab3d4c47d852f33bb (commit)
      from  81f1895d14ab40f5bca8b900e82d4b4c6406bc4b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=00b167e39d3f512b071286679f032758b9c93c92
commit 00b167e39d3f512b071286679f032758b9c93c92
Merge: 1c01056 4fd8658
Author: Ben Burnett <bburnett at poly.edu>
Date:   Fri Apr 26 17:26:11 2013 -0400

    Merge branch 'services_modules_nodes' into next

 modules/geowebsocket.py         |   37 +++++++++++++++++++++++--------------
 nodes/__init__.py               |    9 +--------
 nodes/streammaster.py           |    4 +---
 nodes/streamworker.py           |   10 +++++-----
 web/apps/streaming/streaming.js |    4 +++-
 5 files changed, 33 insertions(+), 31 deletions(-)

http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=1c01056d50573613ad5a35dd7196f41745480779
commit 1c01056d50573613ad5a35dd7196f41745480779
Merge: 81f1895 303caca
Author: Ben Burnett <bburnett at poly.edu>
Date:   Fri Apr 26 16:54:02 2013 -0400

    Merge branch 'services_modules_nodes' into next
    
    Conflicts:
    	geoweb.py

 CMakeLists.txt                                     |   23 ++-
 geoweb.py                                          |    4 +-
 geowebsocket.py                                    |  120 ---------
 modules/geowebsocket.py                            |  216 ++++++++++++++++
 modules/logging.py                                 |   13 +
 modules/websocket_chat.py                          |  125 ----------
 modules/websocket_pi.py                            |  146 -----------
 nodes/__init__.py                                  |  152 ++++++++++++
 nodes/echo.py                                      |   14 +
 .../streaming/master.py => nodes/streammaster.py   |  257 ++++++++------------
 .../streaming/worker.py => nodes/streamworker.py   |   86 ++-----
 server.conf.in                                     |    3 +-
 services/streaming.py                              |   54 ----
 services/streaming/client.py                       |   38 ---
 web/apps/streaming/index.html                      |    2 +
 web/apps/streaming/streaming.js                    |  159 +++++-------
 web/lib/srv/init.js                                |    6 +
 web/lib/srv/webSocket.js                           |  253 +++++++++++++++++++
 18 files changed, 863 insertions(+), 808 deletions(-)

-----------------------------------------------------------------------

Summary of changes:
 CMakeLists.txt                                     |   23 ++-
 geoweb.py                                          |    4 +-
 geowebsocket.py                                    |  120 ---------
 modules/geowebsocket.py                            |  225 +++++++++++++++++
 modules/logging.py                                 |   13 +
 modules/websocket_chat.py                          |  125 ----------
 modules/websocket_pi.py                            |  146 -----------
 nodes/__init__.py                                  |  145 +++++++++++
 nodes/echo.py                                      |   14 +
 .../streaming/master.py => nodes/streammaster.py   |  255 ++++++++------------
 .../streaming/worker.py => nodes/streamworker.py   |   86 ++-----
 server.conf.in                                     |    3 +-
 services/streaming.py                              |   54 ----
 services/streaming/client.py                       |   38 ---
 web/apps/streaming/index.html                      |    2 +
 web/apps/streaming/streaming.js                    |  161 +++++--------
 web/lib/srv/init.js                                |    6 +
 web/lib/srv/webSocket.js                           |  253 +++++++++++++++++++
 18 files changed, 865 insertions(+), 808 deletions(-)
 delete mode 100644 geowebsocket.py
 create mode 100644 modules/geowebsocket.py
 create mode 100644 modules/logging.py
 delete mode 100755 modules/websocket_chat.py
 delete mode 100755 modules/websocket_pi.py
 create mode 100644 nodes/__init__.py
 create mode 100644 nodes/echo.py
 rename services/streaming/master.py => nodes/streammaster.py (55%)
 rename services/streaming/worker.py => nodes/streamworker.py (54%)
 delete mode 100644 services/streaming.py
 delete mode 100644 services/streaming/client.py
 create mode 100644 web/lib/srv/init.js
 create mode 100644 web/lib/srv/webSocket.js


hooks/post-receive
-- 
OpenGeoscience