Commit graph

2402 commits

Author SHA1 Message Date
Steve Harris
89bf1adcf5 Merge branch 'development' into development_on_RHEL6
Former-commit-id: 354a736ed5 [formerly 1a9ff8df10] [formerly 2e0db025f3] [formerly a956fd7f4d [formerly 2e0db025f3 [formerly 1e8e1f73bdbb02ee2f8c91d4a2128ea0d77cf084]]]
Former-commit-id: a956fd7f4d
Former-commit-id: ab6310aa243dfb8185d05a0491fd0532879e343a [formerly 6d20cd89ff]
Former-commit-id: 02907147b6
2013-11-04 20:29:07 -06:00
Nate Jensen
3cfb49215f Issue #2361 remove ISerializableObject from redbook and hydro
Change-Id: Ib48dea5d734f19a9919da9fea752b5e0f38a2141

Former-commit-id: 16074e6a14 [formerly 27f09b8096] [formerly 6064000389] [formerly b36d28c9fd [formerly 6064000389 [formerly 2626a79c976ac016352a091bdf66890e929edc85]]]
Former-commit-id: b36d28c9fd
Former-commit-id: e86e430428d15356370e7a0929a62a10de34aaa1 [formerly 3e3400dc7c]
Former-commit-id: 5d2ec98600
2013-11-04 14:30:00 -06:00
Ben Steffensmeier
dd2bb59742 Issue #2491 Clean a few more procedure only objects from ISerializableObject files.
Former-commit-id: c91c0d3f1a [formerly d386c6bc76] [formerly ff5f08d23a] [formerly 5a928e6ad5 [formerly ff5f08d23a [formerly 047e4cd82846adaf8fc3dcdfe087209bd57e210c]]]
Former-commit-id: 5a928e6ad5
Former-commit-id: c694721b6dae8a56fdf9390a3bc7d8934e8b3711 [formerly 08e73de883]
Former-commit-id: d38879158d
2013-11-04 13:01:49 -06:00
Lee Venable
07e89ee05d Merge "Issue #2486. Fixed an error of editing subset box. Corrected mouse wheel handler." into development
Former-commit-id: 04c2b7d6a8 [formerly bfc83fa74e] [formerly 0b3346d699] [formerly 3e7b7cec8f [formerly 0b3346d699 [formerly 325439c2d4243f775d3ccb8af7f332bf13d4aad0]]]
Former-commit-id: 3e7b7cec8f
Former-commit-id: 608f6b9d8262abfc44e2d399f8c52580ba4437af [formerly f6f1b16c0c]
Former-commit-id: c7d03bf267
2013-11-02 10:43:48 -05:00
Slav Korolev
4b225552e2 Issue #2431. Changed labels on the table.
Former-commit-id: 858b167938 [formerly 8874f76878] [formerly dd1ff63737] [formerly 0801f8dedd [formerly dd1ff63737 [formerly 5599d13b9cbac3806c636b629d502aacc1f621b4]]]
Former-commit-id: 0801f8dedd
Former-commit-id: 77ecd7c42b3304b4ff77b15d1213ecb427f5661a [formerly 7d0198b356]
Former-commit-id: 6b3481ca26
2013-11-01 15:06:19 -04:00
Ron Anderson
a0f67a006f Merge "Issue #1843: Ensure user-selected ETN makes it back into the final transmitted product." into development
Former-commit-id: 5e4227410c [formerly a15c620fc8] [formerly 9e9dd04bfd] [formerly cc991ed528 [formerly 9e9dd04bfd [formerly 6346ae61d0639325fa199db525f4e34402b39224]]]
Former-commit-id: cc991ed528
Former-commit-id: c1140f67ed8f586264c71a61de18f87988cedd70 [formerly deb89a88f5]
Former-commit-id: f453d92818
2013-11-01 11:07:39 -05:00
Slav Korolev
9c8b7d1e96 Issue #2486. Fixed an error of editing subset box. Corrected mouse wheel handler.
Former-commit-id: 2487e015b9 [formerly feb9d8db5a] [formerly 7ca47690af] [formerly f7d1939b36 [formerly 7ca47690af [formerly 7d16b7dd07d83975366505140d7a8df2c5c89cf2]]]
Former-commit-id: f7d1939b36
Former-commit-id: 3a1615d06dc67187bd2ec2e01aff550ea0b6e6b1 [formerly 386db59985]
Former-commit-id: fcbe5d09da
2013-11-01 11:03:06 -04:00
Nate Jensen
685c6034b2 Merge "Issue #2491 Fix collaboration Xml." into development
Former-commit-id: caa08095d8 [formerly b986638bc5] [formerly 43b2f50a0a] [formerly 0270e6bde3 [formerly 43b2f50a0a [formerly 311f84bcd1e10f9fd52df836673c9bb6012ee8a0]]]
Former-commit-id: 0270e6bde3
Former-commit-id: 1d11102b6e40b4f27646f1cf7aba32281be912e3 [formerly 47fc100053]
Former-commit-id: 6ed6df6ed0
2013-10-31 18:11:13 -05:00
Bryan Kowal
874bd8aa36 Merge branch 'development' into development_on_RHEL6
Conflicts:
	cots/org.jep.linux64/libjep.so

Former-commit-id: fd5a5096de [formerly 04bcd7e6dc] [formerly 49422aea62] [formerly d08a652e23 [formerly 49422aea62 [formerly ecb1c0da101c986ef21bb8514660605926303a71]]]
Former-commit-id: d08a652e23
Former-commit-id: 2f7241bd44af27a962760419963b91198396fa99 [formerly adb62df96a]
Former-commit-id: d53ec9c750
2013-10-31 15:43:29 -05:00
Bryan Kowal
d3062ea58f 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: 5164a7c0b1 [formerly 38464427d3] [formerly feaacd9356] [formerly c8d7a32e2e [formerly feaacd9356 [formerly bb2efa59ed211345e071829f47d41eba232baae9]]]
Former-commit-id: c8d7a32e2e
Former-commit-id: fc14f5a833bc96ed1a9a8b8cb4ac6b0c2897f30f [formerly d366e70934]
Former-commit-id: f02d4b7a0b
2013-10-31 15:34:46 -05:00
David Gillingham
82721bfe07 Issue #1843: Ensure user-selected ETN makes it back into the final transmitted product.
Change-Id: Id5aede1ba07019150b3a43b45f067a5740d657af

Former-commit-id: 320ef0eb71 [formerly f404f1560c] [formerly 6e1cca2966] [formerly c4f5cc53bb [formerly 6e1cca2966 [formerly 194799b7d3fb719987523a77ba9b3c69a11bb69f]]]
Former-commit-id: c4f5cc53bb
Former-commit-id: 345b0c83f25f83ef27ba6cbf8e70827c774b053d [formerly 3bac577a31]
Former-commit-id: 3776f258a3
2013-10-31 14:07:20 -05:00
Ben Steffensmeier
d27369f59b Issue #2491 Fix collaboration Xml.
Former-commit-id: 0bcf7f77c0 [formerly a5f970e238] [formerly 76b03c41b24dd6bcae696afd2a7ee339f6c0f727 [formerly 3d36cec7be]] [formerly fdeff81da2 [formerly 3d36cec7be [formerly 64517ab3139be3cc21d5df7ff9d36709435bd7cd]]]
Former-commit-id: fdeff81da2
Former-commit-id: 6d36de8b83b8bd6d75e28507dfdb4314d2a89f81 [formerly 49ffb7e92c]
Former-commit-id: 89c999410e
2013-10-31 14:06:37 -05:00
Ron Anderson
dd1b50d116 Issue #2508 Added DiscreteGridSlice.getKeys(), deprecated getKey()
Change-Id: I5d47498c2056de1c217927102770092bb57a372c

Former-commit-id: f0529e0eee [formerly b61ccc1609] [formerly 38e33092a2] [formerly 42e924e021 [formerly 38e33092a2 [formerly 19246ae601e292bd26ba8ba6b9446ef8d82ee663]]]
Former-commit-id: 42e924e021
Former-commit-id: e573e83de25a263065e03ab739ab5d58c0ca7fb1 [formerly eef9d2dfb0]
Former-commit-id: 2f23072e41
2013-10-31 14:04:55 -05:00
Nate Jensen
2aa3471a8a Merge "Issue #2491 Bug fixes and clean up all remaining resource datas. Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6" into development
Former-commit-id: 7648e116ad [formerly b17891ba0e] [formerly ccf3d5b1e9] [formerly de50a9214b [formerly ccf3d5b1e9 [formerly fc3adf193a8afacfec4c36feae4a3f1384119922]]]
Former-commit-id: de50a9214b
Former-commit-id: c89ecfda3d23b19bae8caa3e9277339aa3c12a03 [formerly d6fcc98e76]
Former-commit-id: c9d9070600
2013-10-31 12:24:23 -05:00
Richard Peter
7b0ad6bacc Merge "Issue #2292 - refactor and move overlap/duplicate checks to edex. Peer review comments" into development
Former-commit-id: 2b9cf07bfe [formerly 5048d010f5] [formerly 3139055873] [formerly b482eb2b48 [formerly 3139055873 [formerly 1f07e88f442c0426a9006a2f139d6eef9395ad51]]]
Former-commit-id: b482eb2b48
Former-commit-id: f7dbb5f3661236898b603e2fdf7604e44f42274a [formerly 73462fa134]
Former-commit-id: fca3d73aa7
2013-10-31 11:46:25 -05:00
Mike Duff
ce2afdf1b3 Issue #2292 - refactor and move overlap/duplicate checks to edex.
Peer review comments

Change-Id: I33df9cc7e368778943e25420d18b343781304c7a

Former-commit-id: fbcf271899 [formerly c1bd170f8a] [formerly f123fa11f5] [formerly 3fc811102e [formerly f123fa11f5 [formerly f7405c2acfef95b57b79cf6d8ac3348017e64a59]]]
Former-commit-id: 3fc811102e
Former-commit-id: ac9b1be9e56f34d03174be87fbb48c2a6a187cdc [formerly 4da0648461]
Former-commit-id: b0c54d7c17
2013-10-31 09:22:50 -05:00
David Gillingham
2ddacaea30 Issue #1843: Return status back to client when contacting one of the
configured ETN partners fails.

Change-Id: I5bd49f6930c317ba21725ff53f6ab65d548f037c

Former-commit-id: ab3b629a6b [formerly c58160c9a9] [formerly 297fd6c3d4] [formerly b7b29a1fdb [formerly 297fd6c3d4 [formerly 18a09da6aba3caf83f4c4df71f2fcffb63043fb1]]]
Former-commit-id: b7b29a1fdb
Former-commit-id: 0f0aefb2c1b9d5dfbee8cd33020b863e61f2b01f [formerly 996817f124]
Former-commit-id: 68b0b2e3db
2013-10-30 11:34:46 -05:00
Ben Steffensmeier
8ec09e8f61 Issue #2491 Bug fixes and clean up all remaining resource datas.
Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6

Former-commit-id: a4cbc8020a [formerly e15fecc459] [formerly 5b395f7417] [formerly 27a392f90e [formerly 5b395f7417 [formerly 2412d6f094f98a8c24491ab43a2a88cf696758af]]]
Former-commit-id: 27a392f90e
Former-commit-id: 08cc956d9a9abcf58a33328430ea1253b6f6e00d [formerly 418c259567]
Former-commit-id: 78efdb7572
2013-10-29 17:35:55 -05:00
Nate Jensen
dced4c4d11 Issue #2476 fixed crash, added short[] numpy support, removed gfe wx/discrete string keys hack, cleaned up jep numpy interfaces and code
Former-commit-id: a18df07586 [formerly 554a9cddf3] [formerly f3143ba7b4] [formerly 6880a18f1a [formerly f3143ba7b4 [formerly 0c24c900ce938982306bad9307f3b1ef27b362bb]]]
Former-commit-id: 6880a18f1a
Former-commit-id: df19f622b8df95f3d1447cd1c6c599d088ba4b1c [formerly f2751f017e]
Former-commit-id: 19043faeaa
2013-10-29 14:33:53 -05:00
Mike Duff
3f502364c9 Issue #2430 - Implement the percent used bandwidth utilization graph.
Change-Id: Iad1d750ec1bb0a66a833f8358e27a80d0d6b42c5

Former-commit-id: cff7e321f0 [formerly 2d7c38290e] [formerly 6d5f697300] [formerly 25e4a4741c [formerly 6d5f697300 [formerly 5b628ac782fc8b76729c74fe8bf995a7fc634aaa]]]
Former-commit-id: 25e4a4741c
Former-commit-id: 1328f5fc6ad281525c7abd057dcd30572f31ff3d [formerly 73ecb9af6b]
Former-commit-id: 4beb79d5a7
2013-10-29 13:49:47 -05:00
Ben Steffensmeier
7e0cb095c2 Issue #2491 Move ncep bundles off od SerializationUtil.
Former-commit-id: ca73be2ecb [formerly 9c62c3bae2] [formerly a4174430f7] [formerly 204b47c67d [formerly a4174430f7 [formerly ddaa8e9ded31fb0676f949d5a98a30ad1709a25b]]]
Former-commit-id: 204b47c67d
Former-commit-id: 479b38fd22c3992c7e8afaec4ff032e7fa45f9d9 [formerly 9540b309b3]
Former-commit-id: 09347cdd5a
2013-10-29 12:28:07 -05:00
Nate Jensen
7ac7a7ce3d Merge "Issue #2491 Remove ISerializableObject references in core and d2d viz plugins. Change-Id: I8c89a49d1291f640ac7032b837300fd7b013de07" into development
Former-commit-id: c1a5165bf9 [formerly 4cd0b3fed7] [formerly ac65672cb2] [formerly f62f7dc851 [formerly ac65672cb2 [formerly a35255318c9e5160f69cb784b86fd7d145465aac]]]
Former-commit-id: f62f7dc851
Former-commit-id: 236fe4b18811523bce5e5090bd5f361fa56869a5 [formerly 87917f3548]
Former-commit-id: 9dc4378fc4
2013-10-28 13:27:17 -05:00
Ben Steffensmeier
285a0af019 Issue #2491 Remove ISerializableObject references in core and d2d viz plugins.
Change-Id: I8c89a49d1291f640ac7032b837300fd7b013de07

Former-commit-id: 642e80aadb [formerly 4e86bb8e5f] [formerly 65522e83c9] [formerly 5b439696df [formerly 65522e83c9 [formerly 57825609e668f6595fa8cc6da4ec81a310abf966]]]
Former-commit-id: 5b439696df
Former-commit-id: ae5d9cd5f9d93524f8b356e1b865d0b7966eab25 [formerly 6866344496]
Former-commit-id: 54a39977f5
2013-10-28 13:16:23 -05:00
Ron Anderson
306a5d72f4 Merge "Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins." into development
Former-commit-id: 283404400d [formerly dd3ef2844c] [formerly fa5b6dce02] [formerly f2cfc0c686 [formerly fa5b6dce02 [formerly c4c1905a1ac16682ad5607b853041905dbde8a5b]]]
Former-commit-id: f2cfc0c686
Former-commit-id: 6d4daeecfebab06573c97b74f855c3bb1daa7ec9 [formerly dda2eb89c1]
Former-commit-id: 3575496955
2013-10-28 12:59:44 -05:00
Ben Steffensmeier
2400380daf Issue #2491 Fix alertviz and java 6 compatibility.
Former-commit-id: ef2a281d45 [formerly 0c66089721] [formerly 27165cea30] [formerly 44a6f05986 [formerly 27165cea30 [formerly 2baf2fdd778b55b76be37503935510b057c5eb0e]]]
Former-commit-id: 44a6f05986
Former-commit-id: 82a83e55a2fa0b6a003492ed127ecae2ee7df8d2 [formerly 1f33a1997e]
Former-commit-id: 0e3cf8b47f
2013-10-28 10:14:08 -05:00
Steve Harris
2039d101ef 14.1.1-4 baseline
Former-commit-id: cb3b53f205 [formerly 82dec19b6a] [formerly 20443a5d933e8268c1fb3f455df197a71fca1203 [formerly bd95bb6a4e]] [formerly 99e3707c5b [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]
Former-commit-id: 99e3707c5b
Former-commit-id: 2d757fef6618aded3efb26a4e6771f03101fe824 [formerly 7590a56e0e]
Former-commit-id: b60635cd70
2013-10-28 10:55:16 -04:00
Steve Harris
2d30611c6d 14.1.1-3 baseline
Former-commit-id: a0ba2e1252 [formerly 851f9df229] [formerly 94f24e0d8a] [formerly 5739b4f832 [formerly 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]
Former-commit-id: 5739b4f832
Former-commit-id: 164f1968b2ad159ca45dcba9ade0490d55b9ed19 [formerly 4a6a209aea]
Former-commit-id: aa59400b67
2013-10-28 10:46:02 -04:00
Nate Jensen
91c89ad6e6 Merge "Issue #2491 fix d2d xy bundles." into development
Former-commit-id: 3843a2fe2d [formerly b8d194e4cd] [formerly ca2e057635] [formerly cda57ce742 [formerly ca2e057635 [formerly cbd9dabab1b08d2b3eb2814701bfa40d66ec5e54]]]
Former-commit-id: cda57ce742
Former-commit-id: e024ea40dde60c244a0a5d34215ef2a3de55bd6d [formerly fad56e0c5f]
Former-commit-id: 4938d287fe
2013-10-28 09:31:28 -05:00
Nate Jensen
fa1bd6b2a4 Merge "Issue #2484 Added originatingSite to id for Subscription registry objects." into development
Former-commit-id: 9e65845da0 [formerly 13eafc05c2] [formerly 4b19d287ea] [formerly e4aa2b8a94 [formerly 4b19d287ea [formerly 4b16e5325f63bb7dde3d5a49770fd4c30b69266b]]]
Former-commit-id: e4aa2b8a94
Former-commit-id: ca27ae050bf35e88c84ec39cb3554276213a3fe7 [formerly aa0e2ca80a]
Former-commit-id: 8aa02150c4
2013-10-28 09:07:04 -05:00
Nate Jensen
a2bf6fb3fb Merge "Issue #2491 Remove uneeded ISerializableObject files." into development
Former-commit-id: fe6680fb56 [formerly f98764cfb6] [formerly 5840b34e67] [formerly 15fbcd6984 [formerly 5840b34e67 [formerly 9d43ad381967fff847f33025461a31bb31816819]]]
Former-commit-id: 15fbcd6984
Former-commit-id: a46bb24ed422dbd3fd41b66e023bd7c2d4fc36e7 [formerly 68a8dbe064]
Former-commit-id: e46c285eed
2013-10-28 09:05:01 -05:00
Ben Steffensmeier
694511af94 Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins.
Former-commit-id: e796e01586 [formerly 3b68ce8d72] [formerly 2a83b45f93] [formerly 4c03fc93f1 [formerly 2a83b45f93 [formerly f74c39d591d10748f7e66c15c80390389ab5ec25]]]
Former-commit-id: 4c03fc93f1
Former-commit-id: ea40a4ab707d0769a72c89593d2b1a20c48d84a7 [formerly fbdcadb456]
Former-commit-id: 4eea088717
2013-10-25 15:50:10 -05:00
Ben Steffensmeier
13829ffd04 Issue #2491 Remove ISerializableObject references in uf.viz.monitor plugins.
Former-commit-id: 54130af4c9 [formerly a629f974a5] [formerly de02c88451a8ddfee21be1432313918cb2a173ac [formerly 88ad284e71]] [formerly 3150d960e8 [formerly 88ad284e71 [formerly 16993be4fde0154ea58e4bc55cbecaabdc44b3cb]]]
Former-commit-id: 3150d960e8
Former-commit-id: a38be6aaa816c5c84d60730b77824580d18d9898 [formerly 4311d8ea4c]
Former-commit-id: 237d947086
2013-10-25 15:42:53 -05:00
Ben Steffensmeier
e03a1c1202 Issue #2491 Remove uneeded ISerializableObject files.
Former-commit-id: 230309c25f [formerly f34bfc1e5b] [formerly c14cc609a8] [formerly cac1f07cbb [formerly c14cc609a8 [formerly fd4cc4fde9507cd9abbf394ea5823a8f315c7d55]]]
Former-commit-id: cac1f07cbb
Former-commit-id: cbb9e5689b5ecaf7c5b0202dbf3d51fae0c0dda9 [formerly a06bdc56d6]
Former-commit-id: ce9653ab15
2013-10-25 15:31:39 -05:00
Ben Steffensmeier
ed7e75b748 Issue #2491 fix d2d xy bundles.
Former-commit-id: bb59c04696 [formerly 9922b11f75] [formerly 5b6e32f47e] [formerly 86ba5b9f09 [formerly 5b6e32f47e [formerly 4f41b90c20e25689a24d73bdd92e24952516199a]]]
Former-commit-id: 86ba5b9f09
Former-commit-id: abfcb4c0128db0fe3c621473959c887bb4552882 [formerly ddf45e1cf4]
Former-commit-id: 8248ea2b3b
2013-10-25 14:46:43 -05:00
Nate Jensen
264555b5d7 Merge "Issue #2491 Use reflections to build Procedure JAXB context. Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b" into development
Former-commit-id: 2c88b7d9b3 [formerly 3a453d5442] [formerly 002005139f] [formerly 5a99163569 [formerly 002005139f [formerly 16f9a9ece5743e0e1f2cd71b23287defb277e915]]]
Former-commit-id: 5a99163569
Former-commit-id: 4719aa1e26e1f8f1e10b15401b23c42814a2069f [formerly cf63b37257]
Former-commit-id: b511177fa1
2013-10-24 20:02:18 -05:00
Nate Jensen
e6e0942d70 Merge "Issue #2303 Fixed CAVE status messaging by fixing the setting of the UFStatus factory handler." into development
Former-commit-id: c513cbaa22 [formerly 408ea200fc] [formerly b17fc59a5a] [formerly b1244552e4 [formerly b17fc59a5a [formerly 757ee730af2455ac88f2b5a666e23d32e3e068ef]]]
Former-commit-id: b1244552e4
Former-commit-id: 7e842a91bf165a8db2e89fabd3906c256ec6db0e [formerly 803c9a8217]
Former-commit-id: 3a1856b168
2013-10-24 19:52:13 -05:00
Dave Hladky
e44f20606e Issue #2484 Added originatingSite to id for Subscription registry objects.
Former-commit-id: 68002da957 [formerly 577e2b84e9] [formerly 3c33f6e5ea] [formerly 36d7c60914 [formerly 3c33f6e5ea [formerly f3bd999abcbed2cfb78ebd88604fbe3128e6de34]]]
Former-commit-id: 36d7c60914
Former-commit-id: 84058224c1b44f8002df97e875e14dd66e8446ce [formerly 2b5ffeab74]
Former-commit-id: db33e9cafa
2013-10-24 13:52:45 -05:00
Ben Steffensmeier
3b4ae67ded Issue #2491 Use reflections to build Procedure JAXB context.
Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b

Former-commit-id: f98448d19f [formerly a935ffadf7] [formerly bfc3faf08f] [formerly fa0a0619bc [formerly bfc3faf08f [formerly 220f77069726f3652ca5cd1f7c100e01cf38547a]]]
Former-commit-id: fa0a0619bc
Former-commit-id: 0c6ad2e7a6ad44d264169d56b0486e1f819a8499 [formerly d927e6b2d7]
Former-commit-id: 09a3276d51
2013-10-24 11:28:06 -05:00
Richard Peter
ca392195cb Merge "Issue #2446 Added cluster lock and check for purgeable data to publish." into development
Former-commit-id: ddcfb3785f [formerly 32131b3b27] [formerly 2220ce9aa3] [formerly b5072746fe [formerly 2220ce9aa3 [formerly d41377864a0a20fa6e09f6a035e33402b0d79c16]]]
Former-commit-id: b5072746fe
Former-commit-id: c433dcb03f3a6c8f1b7988a97befddc483c4253f [formerly f71d65d257]
Former-commit-id: feb1655ae3
2013-10-23 16:57:28 -05:00
Ron Anderson
88f6e5d9d7 Issue #2446 Added cluster lock and check for purgeable data to publish.
Change-Id: Ib54c1f917251eb59920254682b1c707b7fdca089

Former-commit-id: 68ef7c7062 [formerly 680ba97826] [formerly 002bb6ab89] [formerly cc28fca175 [formerly 002bb6ab89 [formerly 57d68b507b69ef4a72ceecaa20a9dce3c0d93de3]]]
Former-commit-id: cc28fca175
Former-commit-id: 4b9ce7666378daf235ca6c2275644a5d5cc7407a [formerly 20fcbd322e]
Former-commit-id: 0d9df14596
2013-10-23 16:02:40 -05:00
Nate Jensen
d2af0d52a6 Issue #2361 remove dependencies on mesowest and delete dead grichardson code
Former-commit-id: bd9578dd6d [formerly 65d7d4dac9] [formerly 477c64c8bd] [formerly 2f79b34a77 [formerly 477c64c8bd [formerly a91a4fe2261050daee83b1edaa7d01404b7b89a0]]]
Former-commit-id: 2f79b34a77
Former-commit-id: a01d69eb125667dc0511591658732e612649a73e [formerly 1adac8829f]
Former-commit-id: 2419a99ac7
2013-10-23 14:52:29 -05:00
Brad Gonzales
a6b82470eb Issue #2303 Fixed CAVE status messaging by fixing the setting of the UFStatus factory handler.
Amend: Also applied old patch to fix tool tips on message bar.

Change-Id: I2f83bbd07be9cb07d51c23a7e068144692f44771

Former-commit-id: 3a450cd3c0 [formerly df1e60b078] [formerly 60d7a13afd] [formerly e3883dba15 [formerly 60d7a13afd [formerly 3abca4ca950facaaa5a29cf2aaa6fccdcf469e95]]]
Former-commit-id: e3883dba15
Former-commit-id: 626bc6ac4ce722cbc6c9e2cd43b6ed575ca56112 [formerly b8cd1d5446]
Former-commit-id: 086dfe9ebc
2013-10-23 14:13:03 -05:00
Lee Venable
0d399cc52a Issue #2483 - Fixed image memory leak.
Former-commit-id: 1a52e2b388 [formerly 73caae724c] [formerly a2f75e547d] [formerly 3d6547d644 [formerly a2f75e547d [formerly b590a1d5799a94068fe9e444e40bb3819d596071]]]
Former-commit-id: 3d6547d644
Former-commit-id: 3d39b70d995dcfb7c2529bb9b72c3ce4df1b010c [formerly 74603afd97]
Former-commit-id: 25c7bd679f
2013-10-23 08:26:49 -05:00
Nate Jensen
223337178c Merge "Issue #2361 undo loading maps at startup" into development
Former-commit-id: d936dc839d [formerly 0e5ea7744e] [formerly ced02a508a] [formerly 88ca2a78de [formerly ced02a508a [formerly 9e3b9ba67aafbcb0bfe7de147d00c44aa37403ac]]]
Former-commit-id: 88ca2a78de
Former-commit-id: a55807d37bbef25e8d8929bb33fd3ccf74c0257c [formerly 173e28b9d9]
Former-commit-id: 250f553532
2013-10-22 13:05:22 -05:00
Nate Jensen
9a6f474b0b Issue #2361 undo loading maps at startup
Change-Id: If737fe16df0b11dbb2dd510697cba2ffaa5967a4

Former-commit-id: 4879e1d7d3 [formerly e65d392677] [formerly 5e2ebbaad8] [formerly 938e4a3073 [formerly 5e2ebbaad8 [formerly 15c1452f6970515d91b5bcc0c75de1679f561c87]]]
Former-commit-id: 938e4a3073
Former-commit-id: 7b549b23c7a05b00918c0b4e70c2fde2005dabc1 [formerly d1ff15485c]
Former-commit-id: 621eaab03a
2013-10-22 12:42:41 -05:00
Slav Korolev
d56f7ca3a9 Issue #2455. Fixed error from test.
Former-commit-id: 34300d63a1 [formerly f64d667715] [formerly 359c281b1e] [formerly 981544290e [formerly 359c281b1e [formerly 86967352eba1893eb4ec40187638bfc33d06cc21]]]
Former-commit-id: 981544290e
Former-commit-id: 90582b33ceb3e84ea08f1c20ad1a3bd68ef28ea6 [formerly 263244b606]
Former-commit-id: d0aa6f6f26
2013-10-22 12:34:34 -04:00
Nate Jensen
b1a5a615f3 Merge "Issue #2333 Merging gl refactor from GOES-R work. Preparing GL for data units in image." into development
Former-commit-id: 09ec04b9f4 [formerly 4aa40ad61a] [formerly 50bf735240] [formerly aa0554d073 [formerly 50bf735240 [formerly 41462b804bf079368bead7c1271b1abdb7d4bf63]]]
Former-commit-id: aa0554d073
Former-commit-id: ae45b51290b85ce8a744919e605659b1f78cc2cc [formerly d8a821746c]
Former-commit-id: a58f2a6c10
2013-10-21 14:44:17 -05:00
Slav Korolev
da1acc7fff Issue #2451. Get highlighted rows on the table page after message update. Corrected.
Former-commit-id: 3eb5ae69c0 [formerly 981a44ffe9] [formerly d0d4f12057] [formerly a7883aabd3 [formerly d0d4f12057 [formerly 652094eb318459b1b73924ebba2b542b5f97eaff]]]
Former-commit-id: a7883aabd3
Former-commit-id: 08093b85ce58869330a7d6751c6f0a99e4322a03 [formerly 1d5a028ee1]
Former-commit-id: d5315c8f57
2013-10-17 16:39:26 -04:00
Nate Jensen
9dd39289ef Merge "Issue #2361 fix scan alarm dialog" into development
Former-commit-id: b2629b9d22 [formerly 4c1a3fbd1e] [formerly 3a8650ef28] [formerly 532d9f1bbe [formerly 3a8650ef28 [formerly 75265b17f65de80f0a0400d29a446cadbc619953]]]
Former-commit-id: 532d9f1bbe
Former-commit-id: f2c56097835e64f08a5d48331e7d3b30ef221a5d [formerly 64fdaa70d7]
Former-commit-id: 32ecd61eae
2013-10-17 14:20:52 -05:00
Nate Jensen
ca63e8a2ee Issue #2361 fix scan alarm dialog
Change-Id: Ida44a00730fa14e3c161b4a8bf1ff630701cc426

Former-commit-id: 413ac9b322 [formerly 3ffc8c6c82] [formerly 31a01a7887] [formerly 81fd87d9dd [formerly 31a01a7887 [formerly 566e8591050b83698d5d782f5a5d7885d1327534]]]
Former-commit-id: 81fd87d9dd
Former-commit-id: 3d0e510f23ea361cf143bfcee0bba966812d2c43 [formerly 4cd95b545b]
Former-commit-id: de55e62614
2013-10-17 13:55:19 -05:00