Commit graph

6 commits

Author SHA1 Message Date
Nate Jensen
effb6c68bf Omaha #3549 remove jdt prefs for faster builds
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29

Former-commit-id: 8dbe6abbe4 [formerly ec28d2f1a0 [formerly 3ba611e111585d2aa9cd9f647687fedb794077f7]]
Former-commit-id: ec28d2f1a0
Former-commit-id: 6c1391e938
2014-12-03 15:47:10 -06:00
Bryan Kowal
5164a7c0b1 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: c8d7a32e2e [formerly feaacd9356 [formerly bb2efa59ed211345e071829f47d41eba232baae9]]
Former-commit-id: feaacd9356
Former-commit-id: 38464427d3
2013-10-31 15:34:46 -05:00
Steve Harris
cb3b53f205 14.1.1-4 baseline
Former-commit-id: 99e3707c5b [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]
Former-commit-id: bd95bb6a4e
Former-commit-id: 82dec19b6a
2013-10-28 10:55:16 -04:00
Richard Peter
713d540d81 Issue #2298: Make getPluginName abstract
Change-Id: Ieefc9ab24dee34ed5c653d035db2a2e1f0e6f9ae

Former-commit-id: 7175e78cf7 [formerly 592218edb8 [formerly 54356ea774bfab26b85aff317fc759de41e259d1]]
Former-commit-id: 592218edb8
Former-commit-id: ff660a78c7
2013-09-03 11:51:27 -05:00
Steve Harris
79567aac51 13.4.1-1 baseline
Former-commit-id: 00332e6305 [formerly 2f517b7713 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]]
Former-commit-id: 2f517b7713
Former-commit-id: f95e0ad10b
2013-04-24 17:15:55 -05:00
Max Schenkelberg
a59484e232 Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development.
Change-Id: I37c3135794c991e2405d556823a22768dd491f00

Former-commit-id: 547190329b [formerly b32fbad9c8 [formerly 7b37bda291882ff345d466f4338b6707ed84d4d5]]
Former-commit-id: b32fbad9c8
Former-commit-id: 9d032f3e84
2013-04-01 12:41:50 -05:00