Richard Peter
|
460a7b8b5d
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationprofile/StationProfileDlg.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
rpms/awips2.core/Installer.httpd-pypies/component.spec
rpms/build/i386/build.sh
rpms/build/i386/build.sh-keep-10032013
rpms/build/i386/build.sh-keep-11012013
rpms/build/x86_64/build.sh
rpms/build/x86_64/build.sh.orig
Change-Id: Id1498fac3a822ab2db55e783ef0ebe5519c66461
Former-commit-id: 333073fc97c9d454d0e41f8fbe01be3a19b18184
|
2013-11-12 11:11:36 -06:00 |
|
Bryan Kowal
|
75e6914df1
|
Issue #2540 - finish implementing the python override capability. The pure-python solution will be checked in later.
Amend: addressed review comments
Amend: update DR number
Change-Id: I5ae0c1140e0c90be002e3e3711fc4311ce1a05f0
Former-commit-id: 315ca002de4045f0d7ae6b298012365a052a7430
|
2013-11-11 17:00:17 -06:00 |
|
Bryan Kowal
|
c8d7a32e2e
|
Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
cave/build/static/common/cave/etc/bundles/StationPlot.xml
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
nativeLib/ncep_grib2module/.cproject
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
Former-commit-id: bb2efa59ed211345e071829f47d41eba232baae9
|
2013-10-31 15:34:46 -05:00 |
|
Steve Harris
|
99e3707c5b
|
14.1.1-4 baseline
Former-commit-id: 0cda967cc9da9d2a08a0197db23d48c65f03be81
|
2013-10-28 10:55:16 -04:00 |
|
Matt Nash
|
5e2e35e45b
|
Issue #2250 fix for Python PathManager not correctly closing
Change-Id: I3d600871ea09ec49ca83fdc5d898a4d9a0369d6f
Former-commit-id: a55d89df84db254372db340f22559ac17940ddaf
|
2013-09-25 17:18:54 -05:00 |
|
Steve Harris
|
fe872355a7
|
13.5.1-1 baseline
Former-commit-id: 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3
|
2013-06-10 15:17:17 -04:00 |
|
Matt Nash
|
7943769110
|
Issue #1870 add Python and XML Incremental Override, implemented for both Java
and Python
Change-Id: I293b6abcdffbd2cef35e9b986362113186583c55
Former-commit-id: 27f86d4c39ce8b8e708408511c820a5dd765e4cb
|
2013-05-02 13:39:55 -05:00 |
|
Matt Nash
|
4b896002ac
|
Issue #1870 add package-info.java so that the empty src directory gets pushed to git
Change-Id: I75d97d6b54de65507288c1b43aaa02b143218840
Former-commit-id: df00846cfe22e318eafe40eaaa08a13b20fd5c58
|
2013-04-15 14:53:07 -05:00 |
|
Matt Nash
|
4b23ec7c0a
|
Issue #1870 implement PathManager interface in Python to allow Python code to
get files
Change-Id: I0192c996533b1539194aaeba0213074bef8a4717
Former-commit-id: e3df8efa51ad95c952318b59edca702157a59856
|
2013-04-12 07:55:56 -05:00 |
|