Commit graph

8 commits

Author SHA1 Message Date
Bryan Kowal
f02d4b7a0b 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: 38464427d3 [formerly feaacd9356] [formerly c8d7a32e2e [formerly bb2efa59ed211345e071829f47d41eba232baae9]]
Former-commit-id: c8d7a32e2e
Former-commit-id: d366e70934
2013-10-31 15:34:46 -05:00
Steve Harris
b60635cd70 14.1.1-4 baseline
Former-commit-id: 82dec19b6a [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]
Former-commit-id: 99e3707c5b
Former-commit-id: 7590a56e0e
2013-10-28 10:55:16 -04:00
Ben Steffensmeier
ce9653ab15 Issue #2491 Remove uneeded ISerializableObject files.
Former-commit-id: f34bfc1e5b [formerly c14cc609a8] [formerly cac1f07cbb [formerly fd4cc4fde9507cd9abbf394ea5823a8f315c7d55]]
Former-commit-id: cac1f07cbb
Former-commit-id: a06bdc56d6
2013-10-25 15:31:39 -05:00
Max Schenkelberg
42922dbccf Issue #2190 Sped up viirs map projection for use with nucaps cloud height
Change-Id: I7a99e734b9aede618f3afe7e01f3103f92c3fa52

Former-commit-id: 76b17f2d05 [formerly 5169afc30f] [formerly 8c26afa091 [formerly 3bc32de5b1029287403173cc97d815e018a4531e]]
Former-commit-id: 8c26afa091
Former-commit-id: 3425c21404
2013-08-28 09:31:14 -05:00
Ben Steffensmeier
ad82565d1a Issue #2260 Switch poessounding to NSharp.
Change-Id: Ib1d067727ab6db11c20de308dce34d6752e79e78

Former-commit-id: fb23de355e [formerly 36a920333f] [formerly 74b0b57f4b [formerly 4e83b721a46cea5af56fd2444ba4bf22813604e9]]
Former-commit-id: 74b0b57f4b
Former-commit-id: 94e79ff7b4
2013-08-15 17:51:52 -05:00
Max Schenkelberg
541c66a894 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: 54fe14b06b [formerly 474429aaee] [formerly f08e2d5edc [formerly 00aaabcbe2b7a66c63de3196cc68f57ccb4664a5]]
Former-commit-id: f08e2d5edc
Former-commit-id: fc60d55637
2013-08-05 16:46:02 -05:00
Steve Harris
0e950655f1 13.4.1-1 baseline
Former-commit-id: f95e0ad10b [formerly 2f517b7713] [formerly 00332e6305 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]]
Former-commit-id: 00332e6305
Former-commit-id: 4accbb80db
2013-04-24 17:15:55 -05:00
Max Schenkelberg
ba262e2bc5 Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development.
Change-Id: I37c3135794c991e2405d556823a22768dd491f00

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