[Opengeoscience-developers] OpenGeoscience branch, next, updated. 6bbe28ddd4a0ec96d96e23d8c577fcc902c577ac

[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  6bbe28ddd4a0ec96d96e23d8c577fcc902c577ac (commit)
       via  97672ee258fc9c11221e787d6fc15d5d0cbf5807 (commit)
       via  375b62d6d7d6e0c7f8a4244538a4cc28cfbda657 (commit)
       via  e94d26fffb236126b70849d62993552effc3e074 (commit)
       via  38ffba64e072f76e0ac712c1fa1455696c4e4d11 (commit)
      from  0fafdc2739865af0fb58b156f20ae80f73dfe4cd (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/opengeoscience.git;a=commitdiff;h=6bbe28ddd4a0ec96d96e23d8c577fcc902c577ac
commit 6bbe28ddd4a0ec96d96e23d8c577fcc902c577ac
Merge: 0fafdc2 97672ee
Author:     Ben Burnett <bburnett at poly.edu>
AuthorDate: Fri Mar 8 17:51:37 2013 -0500
Commit:     Ben Burnett <bburnett at poly.edu>
CommitDate: Fri Mar 8 17:51:37 2013 -0500

    Merge branch 'test-mpi-stream' into next


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

Summary of changes:
 .gitignore                      |    2 +
 CMakeLists.txt                  |   10 +-
 experimental/mpi/child.py       |   23 +++
 experimental/mpi/master.py      |   15 ++
 ogs.py                          |    8 +-
 server.conf.in                  |    8 +-
 ws/__init__.py                  |    2 +
 websocket_chat.py => ws/chat.py |    0
 websocket_pi.py => ws/pi.py     |    6 +-
 ws/stream.py                    |  335 +++++++++++++++++++++++++++++++++++++++
 ws/workers/cdmsProcess.py       |   67 ++++++++
 cpi.py => ws/workers/cpi.py     |    0
 12 files changed, 466 insertions(+), 10 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 experimental/mpi/child.py
 create mode 100644 experimental/mpi/master.py
 create mode 100644 ws/__init__.py
 rename websocket_chat.py => ws/chat.py (100%)
 rename websocket_pi.py => ws/pi.py (96%)
 create mode 100644 ws/stream.py
 create mode 100644 ws/workers/cdmsProcess.py
 rename cpi.py => ws/workers/cpi.py (100%)


hooks/post-receive
-- 
OpenGeoscience