[Opengeoscience-developers] OpenGeoscience branch, next, updated. d1de7b2211770b51c301e63073879b4fc64bb04b

Ben Burnett bburnett at poly.edu
Fri Aug 23 18:00:16 EDT 2013


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  d1de7b2211770b51c301e63073879b4fc64bb04b (commit)
       via  ce6f73c625ebe60d4a923a903863640a93cc91dc (commit)
       via  4c157713a18bd0a20e970c625cac8b1cc4d0f7c1 (commit)
       via  278fe6980daef7781dbe63b84bc690c6b80b9876 (commit)
       via  9462cd45e2cdfb8ee50847287b829ffd850691e9 (commit)
       via  f216bef25103a6ba313fefaa33b7336b8a1c9201 (commit)
       via  83ea53b58ad3cbda7d5f119031de0821a83a122b (commit)
      from  439de940c015f4b041dee5bfb18445343ed00c39 (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=d1de7b2211770b51c301e63073879b4fc64bb04b
commit d1de7b2211770b51c301e63073879b4fc64bb04b
Merge: 439de94 ce6f73c
Author: Ben Burnett <bburnett at poly.edu>
Date:   Fri Aug 23 18:00:01 2013 -0400

    Merge branch '54-2-workflow-construction' into next
    
    Conflicts:
    	web/apps/archive/archive.js
    	web/apps/archive/index.html

 web/apps/archive/archive.js        |   96 ++++--
 web/apps/archive/index.html        |   25 +-
 web/lib/wfl/geowebRegistry.js      |  180 ++++++-----
 web/lib/wfl/inputPort.js           |   22 +-
 web/lib/wfl/staticWorkflows.js     |  649 +++++++++++++++++++++---------------
 web/lib/wfl/workflow.js            |   59 +++-
 web/lib/wfl/workflowLayerSource.js |    7 +
 web/lib/wfl/workflowModule.js      |   49 +++-
 web/lib/wfl/workflowStyle.js       |    6 +
 web/lib/wfl/workflowUtils.js       |   62 ++--
 10 files changed, 698 insertions(+), 457 deletions(-)

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

Summary of changes:
 web/apps/archive/archive.js        |   96 ++++--
 web/apps/archive/index.html        |   25 +-
 web/lib/wfl/geowebRegistry.js      |  180 ++++++-----
 web/lib/wfl/inputPort.js           |   22 +-
 web/lib/wfl/staticWorkflows.js     |  649 +++++++++++++++++++++---------------
 web/lib/wfl/workflow.js            |   59 +++-
 web/lib/wfl/workflowLayerSource.js |    7 +
 web/lib/wfl/workflowModule.js      |   49 +++-
 web/lib/wfl/workflowStyle.js       |    6 +
 web/lib/wfl/workflowUtils.js       |   62 ++--
 10 files changed, 698 insertions(+), 457 deletions(-)


hooks/post-receive
-- 
OpenGeoscience



More information about the Opengeoscience-developers mailing list