Commit graph

7330 commits

Author SHA1 Message Date
Nate Jensen
d71d91db84 Merge "Omaha #3760 Moved to grid the remainder of derived parameters with no other explicit references" into omaha_14.4.1
Former-commit-id: 8864443af8 [formerly 4d5fb1f014] [formerly 8864443af8 [formerly 4d5fb1f014] [formerly 69505bc376 [formerly a532e9607d5e8fee053ef3bbfdc5c517ac481544]]]
Former-commit-id: 69505bc376
Former-commit-id: df4476ce7b [formerly 0d0815957c]
Former-commit-id: 26d64bd222
2014-11-13 14:40:41 -06:00
Mark Peters
367f14a388 Omaha #3760 Moved to grid the remainder of derived parameters with no other explicit references
Change-Id: Ifb12010b4527c18b4e498b5de5757bb74634b496

Former-commit-id: 36ebe9468c [formerly a3725b43bc] [formerly 36ebe9468c [formerly a3725b43bc] [formerly 7ae2b9524b [formerly fa93950435431248bd5790788e3a6936b4f4de2b]]]
Former-commit-id: 7ae2b9524b
Former-commit-id: e6e0af04c3 [formerly ee766624c5]
Former-commit-id: 47410b9117
2014-11-13 13:34:42 -06:00
David Lovely
bcb7dbce05 Omaha #2991 Fixed REST URL in Python scripts, Added checks to broker build commands to fail if they didnt work.
Change-Id: I9bc88caa14d08861eb4dd4628b729bedc8500325

Former-commit-id: 132ac21917 [formerly e0525f7816] [formerly 132ac21917 [formerly e0525f7816] [formerly 3686a36ae7 [formerly 89acb99f0639f34e4ba3530e49c81ce5dda42785]]]
Former-commit-id: 3686a36ae7
Former-commit-id: bf66116b50 [formerly 66e3669532]
Former-commit-id: 40087c34e4
2014-11-13 10:59:00 -06:00
Nate Jensen
a25ce72cec Merge "Omaha #3805 Increase time of cluster lock, cleanup statictopo plugin." into omaha_14.4.1
Former-commit-id: c71c893f57 [formerly e2ee787b63] [formerly c71c893f57 [formerly e2ee787b63] [formerly 1c2d8dc1a6 [formerly d6e12ddac807e109746f1614b4fd74d49fe259ca]]]
Former-commit-id: 1c2d8dc1a6
Former-commit-id: 4f2b760876 [formerly 7f83029fdb]
Former-commit-id: 4ba9f579cb
2014-11-13 09:45:40 -06:00
Nate Jensen
1686d435dd Merge "Omaha #3705 fixed collaboration public room empty participants list problem" into omaha_14.4.1
Former-commit-id: f6e9759779 [formerly 3d945c4772] [formerly f6e9759779 [formerly 3d945c4772] [formerly 3e2e3761de [formerly 6ad3a9d449cbdc06d68335d49bb0ac5620585758]]]
Former-commit-id: 3e2e3761de
Former-commit-id: eaae6c7e5e [formerly b1ea383f58]
Former-commit-id: d4d8efd8f5
2014-11-13 09:45:21 -06:00
Ben Steffensmeier
763a6f927d Omaha #3810 Make D2D nsharp more thread safe.
Former-commit-id: 094dae6108 [formerly 376f566451] [formerly 094dae6108 [formerly 376f566451] [formerly 0021311cb2 [formerly 31901b563e4169cc44494134e3cac55a5542a79f]]]
Former-commit-id: 0021311cb2
Former-commit-id: 557aa3778a [formerly 718d1f63c3]
Former-commit-id: 8ac09c9b75
2014-11-12 14:48:08 -06:00
Ben Steffensmeier
29d60f4f53 Omaha #3805 Increase time of cluster lock, cleanup statictopo plugin.
Former-commit-id: 0a0cad6ed5 [formerly 11966fc0de] [formerly 0a0cad6ed5 [formerly 11966fc0de] [formerly 5c65750e82 [formerly 9bbd3f9f8dea46b14d77b796d0ea00285628ea75]]]
Former-commit-id: 5c65750e82
Former-commit-id: ec4f90760a [formerly 14f666f8e8]
Former-commit-id: f979b530d0
2014-11-12 12:50:17 -06:00
Roger Ferrel
73b08f33c6 Omaha #3401 Enter events to upper case verification added.
Change-Id: I32e51568049dcd442b98b929af3041bc741ea6e3

Former-commit-id: 1d6bec894e [formerly 334d738c79] [formerly 1d6bec894e [formerly 334d738c79] [formerly 8cde49f98e [formerly 414f6e16547e0535ae36c5c4cc86f43db54b689c]]]
Former-commit-id: 8cde49f98e
Former-commit-id: 2e30187e47 [formerly ae35ba438a]
Former-commit-id: a5f2fcf963
2014-11-12 10:50:43 -06:00
Brian Clements
83334fa5c8 Omaha #3705 fixed collaboration public room empty participants list problem
Change-Id: I25e35b6f5dc1266191c04131b69c840ccd76363e

Former-commit-id: e4ee934545 [formerly 4089f14d57] [formerly e4ee934545 [formerly 4089f14d57] [formerly a8cc3b8f08 [formerly 251a206c409855ee105c97bdbfe80715142bf25d]]]
Former-commit-id: a8cc3b8f08
Former-commit-id: 75147a31e3 [formerly bbb5371bb7]
Former-commit-id: c25d7e90a9
2014-11-12 10:38:15 -06:00
Mark Peters
47d615fdb4 Omaha #3760 Moved derived parameters with radarVWP model to radar plugin
Change-Id: I57e6d8177eb483e14154b4bf0a1d86b71f40655f

Former-commit-id: abc4361a65 [formerly 9498a60e7b] [formerly abc4361a65 [formerly 9498a60e7b] [formerly 31701eeb9c [formerly e156d9527a0dd5fb25aca0264f1fddf546e60acf]]]
Former-commit-id: 31701eeb9c
Former-commit-id: 50ce1c6db6 [formerly c1ca8b1301]
Former-commit-id: 942daea6c7
2014-11-11 17:16:51 -06:00
Nate Jensen
415684bb4f Merge "Omaha #3760 Moved derived parameters with grid models to grid plugin" into omaha_14.4.1
Former-commit-id: fb577a5a04 [formerly f1c0b33254] [formerly fb577a5a04 [formerly f1c0b33254] [formerly c62edc0486 [formerly c2d32105c4cd1e7acb52b84ba23d119720888c96]]]
Former-commit-id: c62edc0486
Former-commit-id: b10471c457 [formerly d1e6159f2d]
Former-commit-id: 4c48956280
2014-11-11 17:09:08 -06:00
Nate Jensen
ef677fd13b Merge "Omaha #3549 improve logging of findDataTime errors" into omaha_14.4.1
Former-commit-id: 1688272eeb [formerly d330df4e91] [formerly 1688272eeb [formerly d330df4e91] [formerly 76303c22f3 [formerly 979cf995bf6c239a39e57eb06ba36e58ea0d9830]]]
Former-commit-id: 76303c22f3
Former-commit-id: f084d16934 [formerly 5bf6911cd3]
Former-commit-id: e7d5539a43
2014-11-11 17:08:54 -06:00
Roger Ferrel
6322e45910 Omaha #3727 Place HFR and HiResW entries in sub-menus.
Change-Id: I602cf35675c6ea4255ade4cb42ebe5c97207d62e

Former-commit-id: 6494c71a41 [formerly 28041de97e] [formerly 6494c71a41 [formerly 28041de97e] [formerly 739b253792 [formerly 0456cbbaf9c694a73c9862773b0e42165114b78d]]]
Former-commit-id: 739b253792
Former-commit-id: 81fde984dc [formerly 5f53024f75]
Former-commit-id: 8f06e69f21
2014-11-11 16:10:48 -06:00
Mark Peters
5142772560 Omaha #3760 Moved derived parameters with grid models to grid plugin
Change-Id: I7ac459804b50872203103eb0e2b8a833aa1015ba

Former-commit-id: f60b1ac8ae [formerly 805bc7c7bc] [formerly f60b1ac8ae [formerly 805bc7c7bc] [formerly cea38f3162 [formerly 314e0cd90be176af62c452d44ea53587a2408c5d]]]
Former-commit-id: cea38f3162
Former-commit-id: 6974f6f099 [formerly df329c59fe]
Former-commit-id: 014043307e
2014-11-11 15:21:02 -06:00
Nate Jensen
e2f4d0dd19 Omaha #3549 improve logging of findDataTime errors
Change-Id: Ie1af1aac1750ebc42257d3dd3e448bb95801cceb

Former-commit-id: 73ce6473f6 [formerly 9d52d4eb5c] [formerly 73ce6473f6 [formerly 9d52d4eb5c] [formerly aebd4b5849 [formerly 7a1dd6c72261fb0c1118cea226b5c31c8225b1c7]]]
Former-commit-id: aebd4b5849
Former-commit-id: fbd2278f88 [formerly 55078a2d9d]
Former-commit-id: e5bc4d657a
2014-11-11 09:54:18 -06:00
Nate Jensen
a92219b5e2 Merge "Omaha #2991 Initial commit of QPID 0.28 and 0.30. Update native code to work with 0.30." into omaha_14.4.1
Former-commit-id: 3445c780cf [formerly a3366c9417] [formerly 3445c780cf [formerly a3366c9417] [formerly 403e470682 [formerly 8f7fa6b23c7a20b15c5f9bdfdac5add17aab336e]]]
Former-commit-id: 403e470682
Former-commit-id: f272fe312b [formerly d48008929d]
Former-commit-id: 4e66eb66d6
2014-11-11 09:11:18 -06:00
Nate Jensen
305dc41c71 Merge "Omaha #3760 Move appropriate derived parameters to bufrmos, bufrua, lsr" into omaha_14.4.1
Former-commit-id: a0e806d6ce [formerly 13645f54d4] [formerly a0e806d6ce [formerly 13645f54d4] [formerly ef862c6430 [formerly ea80beca2d0da38d31e0fde21414c7b481c8f61d]]]
Former-commit-id: ef862c6430
Former-commit-id: 0ea953d2e3 [formerly bb28405302]
Former-commit-id: 618a3d6b09
2014-11-10 11:19:40 -06:00
Nate Jensen
fc540378c2 Merge "Omaha #3760 Move derived parameter definitions to grid plugin" into omaha_14.4.1
Former-commit-id: 2118f963ce [formerly 1a59453949] [formerly 2118f963ce [formerly 1a59453949] [formerly 12979ce976 [formerly c9856a64e466695be51903d88ba9f87b0286b19b]]]
Former-commit-id: 12979ce976
Former-commit-id: fcb1aa2f87 [formerly 8e9d4a08dd]
Former-commit-id: 2073e43e24
2014-11-10 11:17:16 -06:00
Steve Harris
399b05ad5e Merge tag 'OB_14.3.1-32m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/build.edex/esb/conf/logback-ingest.xml
	edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/IMessageProducer.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java

Former-commit-id: a8a97501ac [formerly a16abe1b8b] [formerly a8a97501ac [formerly a16abe1b8b] [formerly 9de825c332 [formerly 565efec2ebe5a3a1a009d213a77617f4a593aa6b]]]
Former-commit-id: 9de825c332
Former-commit-id: 548f32e067 [formerly 5e6aa15038]
Former-commit-id: 2695a061f4
2014-11-10 08:42:01 -06:00
David Lovely
0b76e0a9b6 Omaha #2991 Initial commit of QPID 0.28 and 0.30. Update native code to work with 0.30.
Change-Id: Ib28bf8e2edb3b299a7122bac7c80f302780b7470

Former-commit-id: b32d54c7f9 [formerly 625e83c445] [formerly b32d54c7f9 [formerly 625e83c445] [formerly 1a191cac55 [formerly 3addb3007b0bf7aab88b423bbf700583fc2b3e48]]]
Former-commit-id: 1a191cac55
Former-commit-id: 3b7d20e623 [formerly b9451471ac]
Former-commit-id: 1b3334a183
2014-11-10 08:27:28 -06:00
Mark Peters
f9511f6990 Omaha #3760 Move derived parameter definitions to grid plugin
Change-Id: I760f2a61e270c38e92c4321489d2b2220d55129b

Former-commit-id: de182355d5 [formerly 131ee29479] [formerly de182355d5 [formerly 131ee29479] [formerly 24f13ec749 [formerly 4c8316b98529d111b24ca7fdfd10d62ba6058148]]]
Former-commit-id: 24f13ec749
Former-commit-id: e378bf783d [formerly 2222f45b98]
Former-commit-id: e0236db551
2014-11-07 16:56:22 -06:00
Mark Peters
f4c8036df5 Omaha #3760 Move appropriate derived parameters to bufrmos, bufrua, lsr
Change-Id: Ic8f3675e7d50cc4b5803bb2c6991ef860afa4dd8

Former-commit-id: 1ce9bac740 [formerly 724cb2e7d2] [formerly 1ce9bac740 [formerly 724cb2e7d2] [formerly b2e7cb64e7 [formerly 06fed9a6d76c59c77e12fec2789707e46df44817]]]
Former-commit-id: b2e7cb64e7
Former-commit-id: 6e08970030 [formerly abf3102d6e]
Former-commit-id: dfc692f1af
2014-11-07 16:17:24 -06:00
Mark Peters
63eab8e51b Omaha #3760 Derived parameter definitons for ldadhydro and obs split to appropriate plugins
Change-Id: I61d7553d300a173bb64d09898c76c23a0ef94241

Former-commit-id: db6fe6bb30 [formerly 80454c815d] [formerly db6fe6bb30 [formerly 80454c815d] [formerly 7c6d46d33a [formerly dc5f62b485b32bea22d9886e22fe053163aff19a]]]
Former-commit-id: 7c6d46d33a
Former-commit-id: e48dfda21c [formerly 8587464689]
Former-commit-id: 7f33db1f72
2014-11-07 14:05:04 -06:00
Nate Jensen
e0354cc22c Merge "Omaha #3760 Derived parameter definitions should be split to appropriate plugins" into omaha_14.4.1
Former-commit-id: 58306dab17 [formerly d5f3bc859e] [formerly 58306dab17 [formerly d5f3bc859e] [formerly caa74b3938 [formerly abd111e667be780e9e5eb3c416b7e4fcf73f5e9a]]]
Former-commit-id: caa74b3938
Former-commit-id: 272fc19c16 [formerly 0bf717f338]
Former-commit-id: bee42bdcf1
2014-11-07 13:35:57 -06:00
Mark Peters
0a37ff3dfb Omaha #3760 Derived parameter definitions should be split to appropriate plugins
Change-Id: I9dfd7623b778e64982dd2de6f00d944c90401611

Former-commit-id: 9d6ddb5cec [formerly 2ee1a9b31f] [formerly 9d6ddb5cec [formerly 2ee1a9b31f] [formerly 54139d0b0c [formerly d4da6be1b1972df984ea1fb3eb1c5476af5d4cfa]]]
Former-commit-id: 54139d0b0c
Former-commit-id: 7ee53bf981 [formerly cee5c4fc4b]
Former-commit-id: 8ab327d689
2014-11-07 12:09:04 -06:00
Lee Venable
1aa3af7535 Merge "Omaha #3667 - Corrected functionality of dialog." into omaha_14.4.1
Former-commit-id: bac800fb79 [formerly b9ae93b31d] [formerly bac800fb79 [formerly b9ae93b31d] [formerly 6e70e2edd7 [formerly d0812d4d7ce5a01f6a5de7ceea84dd098f3c4354]]]
Former-commit-id: 6e70e2edd7
Former-commit-id: 7218fb48b0 [formerly 83b8275545]
Former-commit-id: 04814b0e58
2014-11-07 12:07:12 -06:00
Richard Peter
9c3704dd59 Merge "Omaha #3788 Switch satellite_spatial.gid to a sequence." into omaha_14.4.1
Former-commit-id: b5db573517 [formerly 9047da36ae] [formerly b5db573517 [formerly 9047da36ae] [formerly 4d143654fe [formerly 4b78380f15df6a8d9a35eb7a2b976b982e949243]]]
Former-commit-id: 4d143654fe
Former-commit-id: 3918ef6b8f [formerly fbd7eb38be]
Former-commit-id: 7dcd409481
2014-11-07 11:18:54 -06:00
Ben Steffensmeier
a25cb9d62c Omaha #3788 Switch satellite_spatial.gid to a sequence.
Former-commit-id: f6a74c59f7 [formerly 5d40da982a] [formerly f6a74c59f7 [formerly 5d40da982a] [formerly 7988d740b0 [formerly 919f4ca671ca953b881037e4a69d720d3bf79eb5]]]
Former-commit-id: 7988d740b0
Former-commit-id: bae0a4f665 [formerly 07b91982bb]
Former-commit-id: 6a155a41dc
2014-11-07 10:23:39 -06:00
Richard Peter
494217f808 Merge "Omaha #3643 Archive menu entries consolidated under Archive." into omaha_14.4.1
Former-commit-id: 2f5db5008b [formerly 4bdb77ea6a] [formerly 2f5db5008b [formerly 4bdb77ea6a] [formerly 8328d538cd [formerly e10b35d2537f6aec5cd007e071f570734098c802]]]
Former-commit-id: 8328d538cd
Former-commit-id: f474978bb7 [formerly c9989a4425]
Former-commit-id: 89455a1dd5
2014-11-07 10:01:32 -06:00
Richard Peter
532ee1b6b7 Merge "Omaha #3353 Fix deadlock that freezes cave." into omaha_14.4.1
Former-commit-id: 4608c2ff2c [formerly b92033924b] [formerly 4608c2ff2c [formerly b92033924b] [formerly f1499db1c3 [formerly 24f3f08d27ac6d3e2cba7b5f6f5a3fd8e6452700]]]
Former-commit-id: f1499db1c3
Former-commit-id: bd7a9c2327 [formerly 6cf6dff0f1]
Former-commit-id: 6995c6b05c
2014-11-07 09:50:34 -06:00
Richard Peter
c79c58422a Merge "Omaha #3549 log time to receive data in pypies separate from deserialize time" into omaha_14.4.1
Former-commit-id: 0bf4e96f04 [formerly f13dbb07f3] [formerly 0bf4e96f04 [formerly f13dbb07f3] [formerly f7ef760f5a [formerly c24d5d08e6663e690b0966f71826869127c1a9cf]]]
Former-commit-id: f7ef760f5a
Former-commit-id: 8897a794c0 [formerly 71d478b40d]
Former-commit-id: cf14bfc2cb
2014-11-07 09:21:02 -06:00
Nate Jensen
a5f86aeaf3 Omaha #3356 fix thin client startup when localization caching is
disabled

Change-Id: I38a9299d9cc50c3e6f1b5d781c0754c2af70d478

Former-commit-id: 62f1088e05 [formerly 6173ea452d] [formerly 62f1088e05 [formerly 6173ea452d] [formerly 9c79b4851f [formerly b4817236399d6084da219892d97b6db38d44d64a]]]
Former-commit-id: 9c79b4851f
Former-commit-id: 88d5fa6edb [formerly 2c08bc1e38]
Former-commit-id: e87243e0ee
2014-11-06 16:48:11 -06:00
Nate Jensen
2de5ea3c23 Omaha #3549 log time to receive data in pypies separate from deserialize
time

Change-Id: I10e1fd81305b7653849ec3801fa1136368c19943

Former-commit-id: 50d2b6de1d [formerly a3b292c116] [formerly 50d2b6de1d [formerly a3b292c116] [formerly 9380b5ee1f [formerly 61ee939fb5611c0043cd3440716a03763785a7ab]]]
Former-commit-id: 9380b5ee1f
Former-commit-id: eb4c4b23b7 [formerly e16430a496]
Former-commit-id: 5cae62980a
2014-11-06 15:57:42 -06:00
Slav Korolev
37a7beb45e Omaha #3667 - Corrected functionality of dialog.
Former-commit-id: 45c9b0560a [formerly fbb9e62cfc] [formerly 45c9b0560a [formerly fbb9e62cfc] [formerly 9f0b1a68e6 [formerly cf354d6ac5668ba502feb188bdf17a0967168b19]]]
Former-commit-id: 9f0b1a68e6
Former-commit-id: a49a3bbcc4 [formerly a3aaf1a744]
Former-commit-id: 0ba3e8d678
2014-11-06 15:24:12 -05:00
Brian.Dyke
0c9c29bff8 Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java

Former-commit-id: 43b6c9ff82 [formerly 1cd471ed72] [formerly 43b6c9ff82 [formerly 1cd471ed72] [formerly 1e7d47d2aa [formerly b9d6c75a5c5f4cbe6b1e32f37e044989edf7c39f]]]
Former-commit-id: 1e7d47d2aa
Former-commit-id: f2fad2a476 [formerly 331a06fedb]
Former-commit-id: 66d8327025
2014-11-06 13:14:24 -05:00
Dave Hladky
33a80a9ef0 Omaha #3798 Merge Fixes
Former-commit-id: 302464acda [formerly 2c61cae7ab] [formerly 302464acda [formerly 2c61cae7ab] [formerly 7f051d34e6 [formerly 011a9d5b937e1a8a337ffaf04ba47cd7080ffaf5]]]
Former-commit-id: 7f051d34e6
Former-commit-id: 08b98856aa [formerly 78e91a0c62]
Former-commit-id: 161d54e8ec
2014-11-06 12:09:42 -06:00
Brian.Dyke
f25f4ecb2c Merge branch 'master_14.2.4' into master_14.3.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 4ac24af0a9 [formerly aae68215c8] [formerly 4ac24af0a9 [formerly aae68215c8] [formerly acf00264f4 [formerly 5c2079dd25181c68f872691e81842aff0f696f8d]]]
Former-commit-id: acf00264f4
Former-commit-id: 2743718323 [formerly 2b470ad1a1]
Former-commit-id: 54f82d7f6f
2014-11-06 12:55:21 -05:00
Nate Jensen
dedad2059a Merge "Omaha #2714 created satellite.gini edex plugin" into omaha_14.4.1
Former-commit-id: b4c44c6695 [formerly 6560926461] [formerly b4c44c6695 [formerly 6560926461] [formerly a943e8e9e0 [formerly da81f4d7ceeb5251b69e72cfddde9e59de5a2da1]]]
Former-commit-id: a943e8e9e0
Former-commit-id: fee6faa453 [formerly a826865e0d]
Former-commit-id: 9d5dfeb486
2014-11-06 11:26:10 -06:00
Brian Clements
f9d30562ed Omaha #2714 created satellite.gini edex plugin
moved satellite decoder to new plugin
replaced database table lookups with in-memory tables backed by XML

Change-Id: I45269240964dd3590ec2068472cf0b4f5dd54c60

Former-commit-id: cab31dd11f [formerly db7652f69d] [formerly cab31dd11f [formerly db7652f69d] [formerly 1954463cfc [formerly df744611151caf6492f5dc084974140c1a6fae0a]]]
Former-commit-id: 1954463cfc
Former-commit-id: 2ca42c3e03 [formerly 7de6a37637]
Former-commit-id: 8aba8edf08
2014-11-06 11:06:19 -06:00
Dave Hladky
2d38aa6ada Omaha #3132 merge in PDA into 14.4.1
Former-commit-id: 23f945bad9 [formerly b954a12e79] [formerly 23f945bad9 [formerly b954a12e79] [formerly ef29e2883c [formerly 38944c601a800e96fbdd34d51034bb7e42ae4a27]]]
Former-commit-id: ef29e2883c
Former-commit-id: df8a326878 [formerly d4edc92ec5]
Former-commit-id: 750200f237
2014-11-06 09:48:54 -06:00
Dave Hladky
4c18bc4e66 Merge branch 'omaha_pda' into omaha_14.4.1
Former-commit-id: 6176578771 [formerly 1c6282503e] [formerly 6176578771 [formerly 1c6282503e] [formerly 1923af2aab [formerly 465a3cff39ad6f0159de561aaf6e8e89e99762ed]]]
Former-commit-id: 1923af2aab
Former-commit-id: 0cbbdd5755 [formerly b0a481d29d]
Former-commit-id: 8cd9d3bb55
2014-11-06 09:34:39 -06:00
Dave Hladky
899865c94a Merge branch 'omaha_pda' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into omaha_pda
Former-commit-id: 4cfe179d9e [formerly fa065dcfe8] [formerly 4cfe179d9e [formerly fa065dcfe8] [formerly 66922edb00 [formerly cc451692b975f3e40c08960585970b1965aa5b84]]]
Former-commit-id: 66922edb00
Former-commit-id: 723d4d63d0 [formerly f44326ad0f]
Former-commit-id: 03f3a97463
2014-11-06 09:18:39 -06:00
Steve Harris
b05ff6ebad Merge branch 'omaha_14.4.1' into omaha_pda
Former-commit-id: 1d162b6476 [formerly 1a8817803d] [formerly 1d162b6476 [formerly 1a8817803d] [formerly 4d0eef66f3 [formerly 3fdd69aade32e40d4684da739b19a414e0ba37df]]]
Former-commit-id: 4d0eef66f3
Former-commit-id: d5303fecde [formerly c2d4ce5ba0]
Former-commit-id: 4a4db9b9a1
2014-11-05 07:58:05 -06:00
Ron Anderson
195085cbd9 Omaha #3557 Fixed NPE when parm is removed from display
Change-Id: I14a82967256a788c25d049a4fd119289c909ad91

Former-commit-id: 377f1a5acb [formerly f0b58e1daa] [formerly 377f1a5acb [formerly f0b58e1daa] [formerly 1f0fee6536 [formerly 4ba96e15f55e276cf78b06f71d3e5d6c98bcab8b]]]
Former-commit-id: 1f0fee6536
Former-commit-id: e8df187d74 [formerly c80c3a2661]
Former-commit-id: 5c4a180d27
2014-11-04 17:41:19 -06:00
Roger Ferrel
effdc7ec2a Omaha #3353 Fix deadlock that freezes cave.
Change-Id: I4afa5c505178f30ada5dd58612b0703ab9529e6b

Former-commit-id: 334b156d2e [formerly 398a8d6043] [formerly 334b156d2e [formerly 398a8d6043] [formerly acbde703a2 [formerly 871fa68ddf242f1e63286939b1324fc3197c7336]]]
Former-commit-id: acbde703a2
Former-commit-id: 304a337a0f [formerly f27f2c456a]
Former-commit-id: 4ebf8669f4
2014-11-04 14:13:29 -06:00
Steve Harris
ada6d69ce0 Merge tag 'OB_14.3.1-31m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/dialogs/SpellCheckDlg.java

Former-commit-id: 472d9bd206 [formerly a5398d8035] [formerly 472d9bd206 [formerly a5398d8035] [formerly e770670ebf [formerly 361f7bcf425edaf687cbfc63d4c165790b45a5bf]]]
Former-commit-id: e770670ebf
Former-commit-id: e42a5d296f [formerly 42db241877]
Former-commit-id: c4b8243a6e
2014-11-04 13:17:44 -06:00
Steve Harris
4614ea10a5 Merge branch 'master_14.3.1' (14.3.1-31) into omaha_14.3.1
Former-commit-id: 0acbe91e58 [formerly 98f2a877f6] [formerly 0acbe91e58 [formerly 98f2a877f6] [formerly 2ed98bb227 [formerly b70eb5b35985453e77ef2337728c65161ba60422]]]
Former-commit-id: 2ed98bb227
Former-commit-id: 1deef1254f [formerly 585bebbf12]
Former-commit-id: b72af6ee72
2014-11-04 13:05:36 -06:00
Ron Anderson
6c57033c28 Issue #3775 Fix db does not exist for getParmList() error when runProcedure creates new mutable db.
Change-Id: I28eef61e4eea77278efe3cbf8828c3357c856785

Former-commit-id: af9fd16f73 [formerly b508a7134c] [formerly af9fd16f73 [formerly b508a7134c] [formerly dd230d9f01 [formerly de45da45f39169e3924122a7baf68ab6762e74e2]]]
Former-commit-id: dd230d9f01
Former-commit-id: 3b2b59689b [formerly 47aadc52c1]
Former-commit-id: 023abd756b
2014-11-04 11:03:42 -06:00
Roger Ferrel
c1c76e4fe0 Omaha #3643 Archive menu entries consolidated under Archive.
Former-commit-id: 4877ec1cc6 [formerly 18ef2df48c] [formerly 4877ec1cc6 [formerly 18ef2df48c] [formerly 78614a83b2 [formerly 4eca2144b9d1109250dc9ceefe82701c66754980]]]
Former-commit-id: 78614a83b2
Former-commit-id: ad29b504dd [formerly 8a7c197d84]
Former-commit-id: 4de983bb97
2014-11-04 10:04:30 -06:00
Nate Jensen
86a0d3cd8c Merge "Omaha #3601 Update satellite inventory scripts to DAF" into omaha_14.4.1
Former-commit-id: cf3e451448 [formerly 5e30cb57a8] [formerly cf3e451448 [formerly 5e30cb57a8] [formerly c1f2f79c24 [formerly 524272eee2b2b27d46452509e944522649456d84]]]
Former-commit-id: c1f2f79c24
Former-commit-id: 2ea56a028f [formerly 56224cc04b]
Former-commit-id: 1584c8655d
2014-11-04 08:48:58 -06:00