Commit graph

11 commits

Author SHA1 Message Date
Bryan Kowal
e1fcf67a5d 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 38464427d3 [formerly feaacd9356] [formerly c8d7a32e2e [formerly bb2efa59ed211345e071829f47d41eba232baae9]]]
Former-commit-id: 38464427d3 [formerly feaacd9356]
Former-commit-id: 38464427d3
Former-commit-id: 5164a7c0b1
2013-10-31 15:34:46 -05:00
Steve Harris
c3693c792e 14.1.1-4 baseline
Former-commit-id: 99e3707c5b [formerly 82dec19b6a [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]
Former-commit-id: 82dec19b6a [formerly bd95bb6a4e]
Former-commit-id: 82dec19b6a
Former-commit-id: cb3b53f205
2013-10-28 10:55:16 -04:00
Nate Jensen
5a34705303 Issue #2361 remove XML annotations and IDecoderGettable from a variety of plugins
Change-Id: Ib9b09659bbcca9b47c3e185e895d0deb1ba23739

Former-commit-id: f82364f18e [formerly 145b6fffce [formerly 6c2ff04b69] [formerly f82364f18e [formerly 065be6691bf102699dc7ece3424f6972792c4d6f]]]
Former-commit-id: 145b6fffce [formerly 6c2ff04b69]
Former-commit-id: 145b6fffce
Former-commit-id: 6437ca3524
2013-10-15 10:08:15 -05:00
Richard Peter
a60a17f71e Issue #2298: Make getPluginName abstract
Change-Id: Ieefc9ab24dee34ed5c653d035db2a2e1f0e6f9ae

Former-commit-id: 7175e78cf7 [formerly ff660a78c7 [formerly 592218edb8] [formerly 7175e78cf7 [formerly 54356ea774bfab26b85aff317fc759de41e259d1]]]
Former-commit-id: ff660a78c7 [formerly 592218edb8]
Former-commit-id: ff660a78c7
Former-commit-id: 713d540d81
2013-09-03 11:51:27 -05:00
Max Schenkelberg
5c62c790d0 Issue #2190 Refactored Popup SkewT and cloud height sampling to create clearer separation of functionality and implemented NUCAPS sounding source.
Amend: Fixed println, added uncustomization of displays to interface, fixed font issue
Amend: Fixed comments and switched to TimeUtil for common constants for time

Change-Id: I92b49a59848ee4a8f61205ab21f5de2e0c260525

Former-commit-id: f08e2d5edc [formerly 54fe14b06b [formerly 474429aaee] [formerly f08e2d5edc [formerly 00aaabcbe2b7a66c63de3196cc68f57ccb4664a5]]]
Former-commit-id: 54fe14b06b [formerly 474429aaee]
Former-commit-id: 54fe14b06b
Former-commit-id: 7d88c2a719
2013-08-05 16:46:02 -05:00
Steve Harris
2f344da22c 13.5.1-1 baseline
Former-commit-id: fe872355a7 [formerly 6384018950 [formerly 998961612c] [formerly fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: 6384018950 [formerly 998961612c]
Former-commit-id: 6384018950
Former-commit-id: 5d99df9969
2013-06-10 15:17:17 -04:00
Ben Steffensmeier
076bbba884 Issue #1869 Remove dataURI column from PluginDataObject.
Change-Id: I3450130d8e68c065683794ba941a83897fe36745

Former-commit-id: 79015595ee [formerly dab2af2df5 [formerly 4209e014d8] [formerly 79015595ee [formerly 7fd2829cd730562a549a2f3c423ac5ead15872e7]]]
Former-commit-id: dab2af2df5 [formerly 4209e014d8]
Former-commit-id: dab2af2df5
Former-commit-id: 7c91a83521
2013-05-08 18:39:25 -05:00
Steve Harris
4ff5dfa203 13.4.1-4 baseline
Former-commit-id: 7a78f8ac6e [formerly 99f4569650 [formerly d33e5861aa] [formerly 7a78f8ac6e [formerly 4477bad886dc7ae0418409e3bc5ebce7965b6146]]]
Former-commit-id: 99f4569650 [formerly d33e5861aa]
Former-commit-id: 99f4569650
Former-commit-id: ef5893b279
2013-05-02 10:00:38 -05:00
Steve Harris
925ad154e1 13.4.1-1 baseline
Former-commit-id: 00332e6305 [formerly f95e0ad10b [formerly 2f517b7713] [formerly 00332e6305 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]]]
Former-commit-id: f95e0ad10b [formerly 2f517b7713]
Former-commit-id: f95e0ad10b
Former-commit-id: 79567aac51
2013-04-24 17:15:55 -05:00
Brad Gonzales
1fc5ec64fa Issue #1857 Added sequence generator annotation to PluginDataObject concrete classes.
Amend: comment updates from peer review.
       added sequence delta script.

Change-Id: Id8685fa0790926564d5d575e43a3da24db27dcf1

Former-commit-id: b75ef08190 [formerly 005c935be6 [formerly dc37712fda] [formerly b75ef08190 [formerly 562c9fa0341d0fb351adb8e57c14f1ce0bc59c95]]]
Former-commit-id: 005c935be6 [formerly dc37712fda]
Former-commit-id: 005c935be6
Former-commit-id: c7318522e1
2013-04-16 14:44:06 -05:00
Max Schenkelberg
675d4d54ec Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development.
Change-Id: I37c3135794c991e2405d556823a22768dd491f00

Conflicts:

	cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/rsc/VIIRSDataCallback.java


Former-commit-id: b042037a67 [formerly be574276f9 [formerly 6d0960c4ef] [formerly b042037a67 [formerly ed981dc2487d169a502f7396520899fc55ff3299]]]
Former-commit-id: be574276f9 [formerly 6d0960c4ef]
Former-commit-id: be574276f9
Former-commit-id: a5994b8983
2013-04-04 13:21:35 -05:00