[Opengeoscience-developers] OpenGeoscience branch, next, updated. 4afffb0eab83710e4cfe130ad7eaf8e93c4290df

[Ben Burnett]

Aashish,

Branch services_modules_nodes should be ready to go into master. Can you
review and merge it?

Thanks,
Ben


On Wed, May 1, 2013 at 1:20 PM, Ben Burnett <bburnett at poly.edu> wrote:

> 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  4afffb0eab83710e4cfe130ad7eaf8e93c4290df (commit)
>        via  5b0c250e44258cd62ff3b8f05ef1b9a6f7d6d655 (commit)
>        via  be8a8a2c5942cd42a50cd41834472fe21e5e3456 (commit)
>        via  d8355cb5b7a84026d7fbe1db121b700d1ed638d8 (commit)
>        via  27704500eeb7b214b200e48d3217e6ba2d67596b (commit)
>        via  f4c8fa87aa1e7b19bff96f7470f8a0c9cfbd1fd2 (commit)
>       from  96c9b158580bd5d9e9ff64af3a9a547ad839934b (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=4afffb0eab83710e4cfe130ad7eaf8e93c4290df
> commit 4afffb0eab83710e4cfe130ad7eaf8e93c4290df
> Merge: 96c9b15 5b0c250
> Author: Ben Burnett <bburnett at poly.edu>
> Date:   Wed May 1 13:19:32 2013 -0400
>
>     Merge branch 'services_modules_nodes' into next
>
>     Conflicts:
>         geoweb.py
>
>  geoweb.py            |   77
> +++++++++++++++++++++++++++++++++++++++++--------
>  services/__init__.py |   54 -----------------------------------
>  temp/testService.py  |    2 +
>  3 files changed, 66 insertions(+), 67 deletions(-)
>
> -----------------------------------------------------------------------
>
> Summary of changes:
>  geoweb.py            |   77
> +++++++++++++++++++++++++++++++++++++++++--------
>  services/__init__.py |   54 -----------------------------------
>  temp/testService.py  |    2 +
>  3 files changed, 66 insertions(+), 67 deletions(-)
>  delete mode 100644 services/__init__.py
>  create mode 100644 temp/testService.py
>
>
> hooks/post-receive
> --
> OpenGeoscience
> _______________________________________________
> Opengeoscience-developers mailing list
> Opengeoscience-developers at public.kitware.com
>
> http://public.kitware.com/cgi-bin/mailman/listinfo/opengeoscience-developers
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/opengeoscience-developers/attachments/20130501/358cbce6/attachment.html>