[Opengeoscience-developers] OpenGeoscience branch, next, updated. 53f59300b1410d8e52582730ee1b1a9e34862170

Chris Harris chris.harris at kitware.com
Tue Aug 6 13:44:01 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  53f59300b1410d8e52582730ee1b1a9e34862170 (commit)
       via  bbc6ce71277e0f074b4d88949ae08f4d092ba795 (commit)
       via  78ce1bd29bbb5bcce949a527c1486206d6faea5a (commit)
       via  ec800afb3204db11abb39fffab675438ac42c7ed (commit)
       via  605c3f292116e8b458a592b5c9db828d35abdc6c (commit)
       via  0f4407127aa5e122960f89a007b61afcea392f7d (commit)
       via  cbfa1511a48be4cb22dd2369a25abfa2a2bf3d29 (commit)
       via  6401083ba7b38e4fba19e22a48490fa315bb1706 (commit)
       via  9e7bf26e0904cb439c8e582958d6ba482d293a64 (commit)
       via  b37e8dedee72db0cd3106877b6c7aa003e1edfbd (commit)
      from  7850902f7eb60daf2e1154b0a20a9ba1dc489de2 (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=53f59300b1410d8e52582730ee1b1a9e34862170
commit 53f59300b1410d8e52582730ee1b1a9e34862170
Merge: 7850902 bbc6ce7
Author: Chris Harris <chris.harris at kitware.com>
Date:   Tue Aug 6 13:38:50 2013 -0400

    Merge branch '8-esgf-query' into next
    
    Conflicts:
    	web/apps/archive/archive.js
    	web/lib/geo/map.js

 CMakeLists.txt                                     |    1 +
 geocelery                                          |   32 +
 geoweb.py                                          |    5 +
 modules/esgf/__init__.py                           |   54 +
 modules/esgf/down.py                               |   78 +
 modules/esgf/download.py                           |   83 +
 modules/esgf/query.py                              |   68 +
 modules/logging.py                                 |   13 -
 .../MyProxyClient.egg-info/PKG-INFO                |   50 +
 .../MyProxyClient.egg-info/SOURCES.txt             |   17 +
 .../MyProxyClient.egg-info/dependency_links.txt    |    1 +
 .../MyProxyClient.egg-info/entry_points.txt        |    2 +
 .../MyProxyClient.egg-info/not-zip-safe            |    1 +
 .../MyProxyClient.egg-info/requires.txt            |    1 +
 .../MyProxyClient.egg-info/top_level.txt           |    1 +
 modules/thirdparty/MyProxyClient-1.3.0/PKG-INFO    |   50 +
 modules/thirdparty/MyProxyClient-1.3.0/README      |   28 +
 .../MyProxyClient-1.3.0/myproxy/__init__.py        |   12 +
 .../MyProxyClient-1.3.0/myproxy/client.py          | 1583 ++++++++++++++++++++
 .../MyProxyClient-1.3.0/myproxy/script.py          |  235 +++
 .../MyProxyClient-1.3.0/myproxy/test/__init__.py   |   10 +
 .../myproxy/test/test_myproxyclient.py             |  350 +++++
 .../MyProxyClient-1.3.0/myproxy/utils/__init__.py  |   22 +
 .../MyProxyClient-1.3.0/myproxy/utils/openssl.py   |  233 +++
 modules/thirdparty/MyProxyClient-1.3.0/setup.cfg   |    6 +
 modules/thirdparty/MyProxyClient-1.3.0/setup.py    |   85 ++
 web/apps/archive/archive.js                        |  315 ++++-
 web/apps/archive/index.html                        |   82 +-
 web/apps/archive/workflow.js                       |   28 +-
 web/lib/geo/archiveLayerSource.js                  |    6 +-
 web/lib/geo/featureLayer.js                        |   41 +-
 web/lib/geo/layerSource.js                         |   16 +
 web/lib/geo/map.js                                 |    9 +-
 web/lib/geo/openStreetMapLayer.js                  |    4 +-
 web/lib/geoweb.min.js                              |    1 +
 web/lib/ui/gis.js                                  |  314 +++--
 web/lib/vgl/renderer.js                            |    2 +-
 37 files changed, 3625 insertions(+), 214 deletions(-)

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

Summary of changes:
 CMakeLists.txt                                     |    1 +
 geocelery                                          |   32 +
 geoweb.py                                          |    5 +
 modules/esgf/__init__.py                           |   54 +
 modules/esgf/down.py                               |   78 +
 modules/esgf/download.py                           |   83 +
 modules/esgf/query.py                              |   68 +
 modules/logging.py                                 |   13 -
 .../MyProxyClient.egg-info/PKG-INFO                |   50 +
 .../MyProxyClient.egg-info/SOURCES.txt             |   17 +
 .../MyProxyClient.egg-info/dependency_links.txt    |    1 +
 .../MyProxyClient.egg-info/entry_points.txt        |    2 +
 .../MyProxyClient.egg-info/not-zip-safe            |    1 +
 .../MyProxyClient.egg-info/requires.txt            |    1 +
 .../MyProxyClient.egg-info/top_level.txt           |    1 +
 modules/thirdparty/MyProxyClient-1.3.0/PKG-INFO    |   50 +
 modules/thirdparty/MyProxyClient-1.3.0/README      |   28 +
 .../MyProxyClient-1.3.0/myproxy/__init__.py        |   12 +
 .../MyProxyClient-1.3.0/myproxy/client.py          | 1583 ++++++++++++++++++++
 .../MyProxyClient-1.3.0/myproxy/script.py          |  235 +++
 .../MyProxyClient-1.3.0/myproxy/test/__init__.py   |   10 +
 .../myproxy/test/test_myproxyclient.py             |  350 +++++
 .../MyProxyClient-1.3.0/myproxy/utils/__init__.py  |   22 +
 .../MyProxyClient-1.3.0/myproxy/utils/openssl.py   |  233 +++
 modules/thirdparty/MyProxyClient-1.3.0/setup.cfg   |    6 +
 modules/thirdparty/MyProxyClient-1.3.0/setup.py    |   85 ++
 web/apps/archive/archive.js                        |  315 ++++-
 web/apps/archive/index.html                        |   82 +-
 web/apps/archive/workflow.js                       |   28 +-
 web/lib/geo/archiveLayerSource.js                  |    6 +-
 web/lib/geo/featureLayer.js                        |   41 +-
 web/lib/geo/layerSource.js                         |   16 +
 web/lib/geo/map.js                                 |    9 +-
 web/lib/geo/openStreetMapLayer.js                  |    4 +-
 web/lib/geoweb.min.js                              |    1 +
 web/lib/ui/gis.js                                  |  314 +++--
 web/lib/vgl/renderer.js                            |    2 +-
 37 files changed, 3625 insertions(+), 214 deletions(-)
 create mode 100755 geocelery
 create mode 100644 modules/esgf/__init__.py
 create mode 100644 modules/esgf/down.py
 create mode 100644 modules/esgf/download.py
 create mode 100644 modules/esgf/query.py
 delete mode 100644 modules/logging.py
 create mode 100644 modules/thirdparty/MyProxyClient-1.3.0/MyProxyClient.egg-info/PKG-INFO
 create mode 100644 modules/thirdparty/MyProxyClient-1.3.0/MyProxyClient.egg-info/SOURCES.txt
 create mode 100644 modules/thirdparty/MyProxyClient-1.3.0/MyProxyClient.egg-info/dependency_links.txt
 create mode 100644 modules/thirdparty/MyProxyClient-1.3.0/MyProxyClient.egg-info/entry_points.txt
 create mode 100644 modules/thirdparty/MyProxyClient-1.3.0/MyProxyClient.egg-info/not-zip-safe
 create mode 100644 modules/thirdparty/MyProxyClient-1.3.0/MyProxyClient.egg-info/requires.txt
 create mode 100644 modules/thirdparty/MyProxyClient-1.3.0/MyProxyClient.egg-info/top_level.txt
 create mode 100644 modules/thirdparty/MyProxyClient-1.3.0/PKG-INFO
 create mode 100644 modules/thirdparty/MyProxyClient-1.3.0/README
 create mode 100644 modules/thirdparty/MyProxyClient-1.3.0/myproxy/__init__.py
 create mode 100644 modules/thirdparty/MyProxyClient-1.3.0/myproxy/client.py
 create mode 100644 modules/thirdparty/MyProxyClient-1.3.0/myproxy/script.py
 create mode 100644 modules/thirdparty/MyProxyClient-1.3.0/myproxy/test/__init__.py
 create mode 100755 modules/thirdparty/MyProxyClient-1.3.0/myproxy/test/test_myproxyclient.py
 create mode 100644 modules/thirdparty/MyProxyClient-1.3.0/myproxy/utils/__init__.py
 create mode 100644 modules/thirdparty/MyProxyClient-1.3.0/myproxy/utils/openssl.py
 create mode 100644 modules/thirdparty/MyProxyClient-1.3.0/setup.cfg
 create mode 100755 modules/thirdparty/MyProxyClient-1.3.0/setup.py


hooks/post-receive
-- 
OpenGeoscience



More information about the Opengeoscience-developers mailing list