xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
awips2/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe
History
Fay.Liang 1e9024ede9 ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m. 
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1

Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	rpms/awips2.core/Installer.postgres/component.spec
	rpms/awips2.core/Installer.python/component.spec
	rpms/awips2.core/Installer.tools/component.spec
	rpms/python.site-packages/Installer.h5py/component.spec
	rpms/python.site-packages/Installer.matplotlib/component.spec
	rpms/python.site-packages/Installer.nose/component.spec
	rpms/python.site-packages/Installer.pupynere/component.spec
	rpms/python.site-packages/Installer.qpid/component.spec
	rpms/python.site-packages/Installer.scientific/component.spec
	rpms/python.site-packages/Installer.scipy/component.spec
	rpms/python.site-packages/Installer.shapely/component.spec
	rpms/python.site-packages/Installer.tables/component.spec

Former-commit-id: 6b77894bd0 [formerly c6bd5d7675] [formerly 6b77894bd0 [formerly c6bd5d7675] [formerly eed6737801 [formerly 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd]]]
Former-commit-id: eed6737801
Former-commit-id: f3ecae8573 [formerly 5cc8e5b4af]
Former-commit-id: 06ac6b396e
2015-01-12 13:03:31 -05:00
..
config Omaha #3243 Update AWIPS2 references to remove deprecated lambert conformal creation. 2014-06-06 15:17:19 -05:00
dataaccess Omaha #3184 renamed valid identifiers to optional 2014-07-31 09:45:01 -05:00
db Merge tag 'OB_14.3.2-8m' into omaha_14.4.1 2014-12-12 10:36:04 -06:00
discrete Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
exception 13.4.1-7 baseline 2013-05-13 12:58:10 -04:00
grid Issue #3572 Fixed getNumpy errors for Grid2DFloat 2014-09-02 12:21:42 -05:00
point Issue #3006 Fixed GetPointDataHandler to handle grids longer than 1 hour. 2014-04-23 17:04:16 -05:00
python VLab Issue #4953 Added support for writing Python and/or Java objects to JSON localization files. 2014-11-12 14:50:21 -06:00
reference Omaha #3503 common.serialization changes 2014-08-08 12:50:06 -05:00
request Omaha #3149 Limit number of grids returned by GFE to constrain size of Thrift response 2014-07-07 09:02:14 -05:00
sample Merge branch 'omaha_14.3.1' into omaha_14.4.1 2014-09-19 10:28:57 -05:00
serialize 13.4.1-7 baseline 2013-05-13 12:58:10 -04:00
server Merge tag 'OB_14.3.1-32m' into omaha_14.4.1 2014-11-10 08:42:01 -06:00
slice Issue #2508 Restore DiscreteGridSlice.setKey method used by iscMosaic. 2014-01-10 13:17:44 -06:00
textproduct Merged 1354 -5 and -6 into 1412 based on 1411-25 2014-04-04 12:57:32 -04:00
time 12.9.1-4 baseline 2012-08-15 15:19:10 -05:00
util ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m. 2015-01-12 13:03:31 -05:00
weather Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
weatherelement Issue #2361 Get some of GFE away from using the global JAXB context, and in the process refactored JAXBManager 2013-10-01 11:25:45 -05:00
DiscreteTerm.java Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
GridDataHistory.java 13.5.1-1 baseline 2013-06-10 15:17:17 -04:00
RemapGrid.java Omaha #2913 Remove dead code using JAI 2014-05-20 13:36:15 -05:00
StatusConstants.java Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00