Commit graph

2594 commits

Author SHA1 Message Date
Mike Duff
8904d8a501 Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays
Change-Id: Ib17ff7cfcb5efcb1737804800a93ec4f82bc6f13

Former-commit-id: f4062cd277 [formerly 0456fd0597] [formerly 8498235fd8] [formerly f4062cd277 [formerly 0456fd0597] [formerly 8498235fd8] [formerly 6a67638a94 [formerly 8498235fd8 [formerly 57755db0d6d77f32d64b4b569bb0af88002a23da]]]]
Former-commit-id: 6a67638a94
Former-commit-id: 3966697849 [formerly f49192936a] [formerly 2876e8ca8c3ac5b87e9cb00735e694e84a5f8df9 [formerly 70c8135fde]]
Former-commit-id: 79e94a80e7729225dba251b67e17c3517adc7fc5 [formerly 916d90ee64]
Former-commit-id: 4adf657556
2014-05-08 14:36:54 -05:00
Ben Steffensmeier
2f6a279abb Issue #3080 Fix NaN handling of SliceSample.
Former-commit-id: 7a38637fb2 [formerly 3a87fa24df] [formerly 0308147ad4] [formerly 7a38637fb2 [formerly 3a87fa24df] [formerly 0308147ad4] [formerly 1b6bdeac86 [formerly 0308147ad4 [formerly 9974018df428c84528cf98e9f868740accbabf58]]]]
Former-commit-id: 1b6bdeac86
Former-commit-id: 33e1805458 [formerly 7beb6429d4] [formerly 883fef057790d3aff91a5945cdfc9c0bb814b3f2 [formerly 80a819f65b]]
Former-commit-id: d2c3a48395c4fe09a3166b1dc9b5cb8612aa5178 [formerly c56d799865]
Former-commit-id: a32bb9b996
2014-05-08 11:49:04 -05:00
Nate Jensen
098587a86f Merge "Issue #2726: Fix GeospatialDataGenerator NPE" into omaha_14.3.1
Former-commit-id: b415dd5c4e [formerly 3fdd5dbdd6] [formerly 8f8ac40c44] [formerly b415dd5c4e [formerly 3fdd5dbdd6] [formerly 8f8ac40c44] [formerly d4fef60be1 [formerly 8f8ac40c44 [formerly 34d2d296f304cd84a8105993803ca35c484c6b6e]]]]
Former-commit-id: d4fef60be1
Former-commit-id: c771f70e7d [formerly a50afc30eb] [formerly a27e3174303ab185af39074281bca050c97c43f0 [formerly 04e906f1a6]]
Former-commit-id: 0f96a1d44d0926b4c44251c9b15a83c3732d3da2 [formerly 677e1662d7]
Former-commit-id: e3d66c87ec
2014-05-08 10:19:43 -05:00
Richard Peter
045900bdb8 Issue #2726: Fix GeospatialDataGenerator NPE
Change-Id: I07213e17fcbbadea9a33471c390bb07472ba31e0

Former-commit-id: 469f2771c3 [formerly 5a7c78c009] [formerly 24539708f9] [formerly 469f2771c3 [formerly 5a7c78c009] [formerly 24539708f9] [formerly 4d99d25a55 [formerly 24539708f9 [formerly fdc542df454887a48f4a55ef6ea9594ff98b3345]]]]
Former-commit-id: 4d99d25a55
Former-commit-id: a65504b301 [formerly 3c21c1042f] [formerly 3612a21996e81b3e6f673f5982a4a6b310ad9022 [formerly 29a8db5216]]
Former-commit-id: 25a31e90dd26b0d819ae4d0ebd928e5b7e5f1143 [formerly 601f151a8b]
Former-commit-id: f5e8f07e8b
2014-05-08 10:14:30 -05:00
Nate Jensen
b725b764ba Issue #2060 fix grid updates and performance
Change-Id: I0937d7360e456f08fb613be547f7b488ebe05b50

Former-commit-id: c41e84630c [formerly c71edb2d4c] [formerly e39378e5f0] [formerly c41e84630c [formerly c71edb2d4c] [formerly e39378e5f0] [formerly acfbce58d1 [formerly e39378e5f0 [formerly a430e85f283b3e41b8520d241f675eff3c6c32e3]]]]
Former-commit-id: acfbce58d1
Former-commit-id: 5289cdf95c [formerly 81b914ad9f] [formerly 18c8713f5f8a78687f4fbd908e1803323d6f2ff0 [formerly 5099fd6463]]
Former-commit-id: 16abadc65ba62f39c5351391736255373944ce3c [formerly f4bb539ae8]
Former-commit-id: 4f18fe5173
2014-05-07 15:30:13 -05:00
Dave Hladky
d740131519 Issue #2940 More filenames printed, null from bad rec.
Former-commit-id: e40c9a7be8 [formerly cd4921b35f] [formerly a2ef100bfc] [formerly e40c9a7be8 [formerly cd4921b35f] [formerly a2ef100bfc] [formerly dadc604ab3 [formerly a2ef100bfc [formerly 26bfd426965d208f92bcb1fcd650b5f2299724a4]]]]
Former-commit-id: dadc604ab3
Former-commit-id: af478efa5d [formerly e58fa39adc] [formerly 30f08e0872c7bff47d05e441f1dd1375d4fa9d03 [formerly f54cbb83a1]]
Former-commit-id: 703f3933ff157bb876bac2fb5586159e18bb37bb [formerly 07c49a82b5]
Former-commit-id: 24a1a5a0c6
2014-05-07 14:51:38 -05:00
Nate Jensen
88f134aef8 Issue #2060 log successful sat precip file creation
Change-Id: I40df627645e0c0e089609f8dcc56b8351a4c56f1

Former-commit-id: a66c157399 [formerly 3c1f9693f2] [formerly f06c77f5ad] [formerly a66c157399 [formerly 3c1f9693f2] [formerly f06c77f5ad] [formerly 170106ad44 [formerly f06c77f5ad [formerly b3158ae940ab59a7a96b4650f0f956c82b0c9d49]]]]
Former-commit-id: 170106ad44
Former-commit-id: e979a3caeb [formerly 40b5e501a2] [formerly 29afb4d86748112fab5054cd93607ac60cb3b546 [formerly af426cf278]]
Former-commit-id: 88312d3bdae00a1d038799307c725c29addd6aaa [formerly 505b45ff22]
Former-commit-id: 6a620ffc04
2014-05-07 09:44:20 -05:00
Nate Jensen
9831077b42 Issue #3101 fix some derived parameters on win64 platform
Change-Id: I9de1d31e7f7c19af437aef834aa84f163bf36d86

Former-commit-id: 3aa9bfdca1 [formerly 49d34cc4e4] [formerly 5191b61b30] [formerly 3aa9bfdca1 [formerly 49d34cc4e4] [formerly 5191b61b30] [formerly aa7c1fac90 [formerly 5191b61b30 [formerly 4659c0240aa31b615bc50228906d514f47a72f94]]]]
Former-commit-id: aa7c1fac90
Former-commit-id: c333277d30 [formerly 815aa21d8e] [formerly e218d9c6b2e2544a412d7bf24b528ba73c8cd8fc [formerly 8c1748d370]]
Former-commit-id: a4bf8704f87869be96548083ce3e4e75a769e292 [formerly b708774e64]
Former-commit-id: cf09a6729c
2014-05-06 17:08:04 -05:00
Richard Peter
c85f22eb55 Issue #2726: update smartInit threads to 1
Change-Id: Ic2d432087f66fd9f03b3d6f01fefce8af0d5b0b0

Former-commit-id: 2044b64206 [formerly 884562700a] [formerly 03ab7599de] [formerly 2044b64206 [formerly 884562700a] [formerly 03ab7599de] [formerly 611c010968 [formerly 03ab7599de [formerly c12469d133558750e85049f7ce0f0a42b802c2b9]]]]
Former-commit-id: 611c010968
Former-commit-id: 8e8e1c45ed [formerly be288505e0] [formerly f30788353ad2101cd2e64a4eed43d47dc68ddbb5 [formerly 4f2d470801]]
Former-commit-id: 91832432fed4e1ab82df2940b746247f362e5e2d [formerly a03997122b]
Former-commit-id: fc1f958e5b
2014-05-06 15:54:23 -05:00
Nate Jensen
12e89bf78d Issue #2060 genericize DataURIFieldConverter
Change-Id: I885b0a8ec64eb69256c04fa2476814b1300fcdd4

Former-commit-id: 37b72c933b [formerly 7701820902] [formerly ff6c77420c] [formerly 37b72c933b [formerly 7701820902] [formerly ff6c77420c] [formerly 87b6df4840 [formerly ff6c77420c [formerly 0a7265da59457e8dc6a122db81b134d6555d5276]]]]
Former-commit-id: 87b6df4840
Former-commit-id: b16bfd2b38 [formerly d1a040b9c2] [formerly 620466e14629a8e102bf9c9fd5dc3bbc2e70ff37 [formerly a6363fc3d4]]
Former-commit-id: 176e5be59eab5566cf29af7c6865a3042d0ab473 [formerly 5f08921768]
Former-commit-id: 17ddc5d8e5
2014-05-06 13:10:48 -05:00
Nate Jensen
77045e05ce Merge "Issue #2060 fill in units on GridRecords created from URIs" into omaha_14.3.1
Former-commit-id: 8b2c2d4be5 [formerly d83fad0054] [formerly 0e3876de34] [formerly 8b2c2d4be5 [formerly d83fad0054] [formerly 0e3876de34] [formerly 4f734ae7f9 [formerly 0e3876de34 [formerly c68f2924c4c7f998af859d7c88cd9d0049d636e5]]]]
Former-commit-id: 4f734ae7f9
Former-commit-id: de7bade647 [formerly 732aaa6001] [formerly ad966bafd4b27ea29634f0d48df0a0cd01558773 [formerly 044d086fc1]]
Former-commit-id: 6911bb772bb5191fbb00c039757c3640c87a1879 [formerly 4db3b99181]
Former-commit-id: c8cc3b1b8e
2014-05-06 13:09:12 -05:00
Nate Jensen
8a31b5edf5 Issue #2060 fill in units on GridRecords created from URIs
Change-Id: Ic7c1594c1442d8463c5050bdefb434995ffc7f8a

Former-commit-id: 1d38804eb2 [formerly 3719c41d2b] [formerly 71b4227061] [formerly 1d38804eb2 [formerly 3719c41d2b] [formerly 71b4227061] [formerly 7cea97ab15 [formerly 71b4227061 [formerly 949d132cf3260db5f75ea665f21601ab91440958]]]]
Former-commit-id: 7cea97ab15
Former-commit-id: e8ca9729eb [formerly 5bf1554597] [formerly 4cf3887df369f38b75f0a2c9f9f7949057e50e42 [formerly 6bdbfb7e1a]]
Former-commit-id: 0fc7bbac68e600996cc014bbf843e66d5484e6e9 [formerly 66cd43313a]
Former-commit-id: ad7a69f2e3
2014-05-06 12:26:21 -05:00
Richard Peter
a21d7ff038 Issue #2726: Autoset route startup order.
Change-Id: I1f4165b6eab12207cf6b6d31964e8170ebe1bddc

Former-commit-id: f76ed476c8 [formerly 8ae9cfba55] [formerly b148d11ec9] [formerly f76ed476c8 [formerly 8ae9cfba55] [formerly b148d11ec9] [formerly 4dc91f494f [formerly b148d11ec9 [formerly 9b9d2b475f4777febf125e4013cba0d971eaf8e8]]]]
Former-commit-id: 4dc91f494f
Former-commit-id: 9846fbd82c [formerly 7fe7b43ee2] [formerly c051c2b6a07908c54dd3268091a67a3084664d5b [formerly c6719da76b]]
Former-commit-id: 87bf6e58065855e010b5eeaf478f1099b3c04845 [formerly 4a140afac6]
Former-commit-id: 4f6a9a0562
2014-05-06 09:46:41 -05:00
Nate Jensen
0fc04a8c55 Issue #2060 fix sat precip for grid data URI removal
Change-Id: Iaa5144a63ff455f5c12a060a9daad0dd0bd04e58

Former-commit-id: f76ace3c9b [formerly 2b6c30e67d] [formerly 0cf0f724f4] [formerly f76ace3c9b [formerly 2b6c30e67d] [formerly 0cf0f724f4] [formerly d82f6e5ff6 [formerly 0cf0f724f4 [formerly cf0bb31583f0ec0b2135aa9101f3247e88e877d0]]]]
Former-commit-id: d82f6e5ff6
Former-commit-id: 3853ef16bb [formerly 09091ccf25] [formerly 7beb650628fb602c30c71cbf5eab29724e2cc3f8 [formerly 97597c3ab1]]
Former-commit-id: 34e886c76b22b953edb7a826d23a880a02b62b77 [formerly 0840a62eb8]
Former-commit-id: d50f19d715
2014-05-05 13:06:08 -05:00
Dave Hladky
766d9f09a7 Merge branch 'master_14.3.1' (14.3.1-3) into omaha_14.3.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/RetrievalGeneratorUtilities.java

Former-commit-id: 7d244313a5 [formerly 0ac4de6ad0] [formerly 333bf8b36d] [formerly 7d244313a5 [formerly 0ac4de6ad0] [formerly 333bf8b36d] [formerly ccaaa1cfea [formerly 333bf8b36d [formerly 2e5ee5565d1847490e46c59866b14f77555e2a7e]]]]
Former-commit-id: ccaaa1cfea
Former-commit-id: d9243205e4 [formerly 93ca9cfe6a] [formerly 407941b24c780437890a6937639d0d55a05f02fd [formerly 7611339cd8]]
Former-commit-id: 1470be2678cc30858e885d64731cb2816e28e3ab [formerly cb94f9fc97]
Former-commit-id: 7e763a5a22
2014-05-05 12:15:14 -05:00
Richard Peter
ce48a0230e Merge "Issue #2940 Better error message for bad XMRG config in FFMP" into omaha_14.3.1
Former-commit-id: 98fa705dd0 [formerly f38816d168] [formerly dc0b598fd4] [formerly 98fa705dd0 [formerly f38816d168] [formerly dc0b598fd4] [formerly 132d63ac44 [formerly dc0b598fd4 [formerly 28b33188773001c34946464093319dc2a1117be9]]]]
Former-commit-id: 132d63ac44
Former-commit-id: 2507aaf753 [formerly 8e141a137a] [formerly c5d890d7b24b88a20dc8c01d92647c6864edfb22 [formerly 5314b412b4]]
Former-commit-id: ad8d5ade754f2f63500d72978fe455c4ad54fb06 [formerly b9351199b8]
Former-commit-id: 9326b9d125
2014-05-02 10:05:59 -05:00
Ben Steffensmeier
c2e3e72d01 Issue #3095 Update JGridData for creation of numeric java package.
Former-commit-id: 80104eaf42 [formerly 956f62a6ec] [formerly 6bdaba048c] [formerly 80104eaf42 [formerly 956f62a6ec] [formerly 6bdaba048c] [formerly 23d6da4a18 [formerly 6bdaba048c [formerly a3081bf46908788e78c707bf51e08f6c98d997bc]]]]
Former-commit-id: 23d6da4a18
Former-commit-id: ae0185a740 [formerly d2c0499f2c] [formerly e59b9a37c055ead6793b199f1f61c40b65e25ce2 [formerly 3300d8c75c]]
Former-commit-id: b8a7373be1db5d578132241657b4da4ea3baedd5 [formerly c2a3dbe9af]
Former-commit-id: dd315aa9b8
2014-05-01 18:02:08 -05:00
Steve Harris
059faff023 Merge branch 'omaha_14.3.1-NHDA' into omaha_14.3.1
Former-commit-id: d2905e51d4 [formerly 9ecd871825] [formerly c8ba70a146] [formerly d2905e51d4 [formerly 9ecd871825] [formerly c8ba70a146] [formerly 779e85cc77 [formerly c8ba70a146 [formerly 36d5942b4a7f1df9b69388b40d0f6c866d9d30b8]]]]
Former-commit-id: 779e85cc77
Former-commit-id: 9a268173ac [formerly 9a6ab8c52f] [formerly bf130d4e15490de77c6bbdbae09ac7d93618c08a [formerly bdf6d0b6be]]
Former-commit-id: 787bb8f6beeae504adb25f278d73dbfbb74159fb [formerly d7c31fe4a9]
Former-commit-id: 523cf536e2
2014-05-01 13:25:15 -05:00
Nate Jensen
b2b5727db3 Merge "Issue #3099 - handle empty location name lists in the data request" into omaha_14.3.1
Former-commit-id: dba33e281e [formerly ba9ed2aba3] [formerly b7536a398b] [formerly dba33e281e [formerly ba9ed2aba3] [formerly b7536a398b] [formerly 96071c250d [formerly b7536a398b [formerly 1ccbd542f3a5025ba0e0c8d640170972823a583d]]]]
Former-commit-id: 96071c250d
Former-commit-id: c617423fd7 [formerly dbca36c2bc] [formerly 88095fd377297b348e1d0c64c9215b50da8eef27 [formerly 4c2923246a]]
Former-commit-id: f4c5590d3e741902d497b7b5cb7b21c8ccf1049b [formerly 704eff96aa]
Former-commit-id: 7c748842f0
2014-05-01 12:40:41 -05:00
Brian Clements
de694643a9 Issue #2903 changed commons.lang to match other unpacking foss
Former-commit-id: eae19ec5ca [formerly 93912625ea] [formerly 3ca4f8cc52] [formerly eae19ec5ca [formerly 93912625ea] [formerly 3ca4f8cc52] [formerly dd5412e119 [formerly 3ca4f8cc52 [formerly ee24eaf54704dcfdf698089a8269e055f7856c80]]]]
Former-commit-id: dd5412e119
Former-commit-id: 8fc0feed89 [formerly 3fd504f1de] [formerly f6d182158a5782516e8b761f409c187bb4622b1d [formerly 2337d5ef56]]
Former-commit-id: e46f09623a9e504ef25b49b889bf64a2c46ca4bb [formerly c7cea4b5f7]
Former-commit-id: 36b2419ff1
2014-05-01 12:34:09 -05:00
Bryan Kowal
3ec47319cc Issue #3099 - handle empty location name lists in the data request
Former-commit-id: dfd5e3dbad [formerly ff21ef813c] [formerly 5eac78f0e0] [formerly dfd5e3dbad [formerly ff21ef813c] [formerly 5eac78f0e0] [formerly a9b9a8b8c4 [formerly 5eac78f0e0 [formerly 79603ec579d6ebcd1ef707f637e1b207ae18f803]]]]
Former-commit-id: a9b9a8b8c4
Former-commit-id: 5267bae3dd [formerly 4775dc1f40] [formerly 766f5d140cfb513aced9899ffa7b673d5595123d [formerly 2079aec2bb]]
Former-commit-id: e262c8f5f445fb2cdc7edc1447e80f9bd8e97f6e [formerly bf24af6980]
Former-commit-id: 10a57d5299
2014-05-01 12:12:42 -05:00
Nate Jensen
7f6e325724 Issue #3101 safe cast numpy shape values to Number
Change-Id: Ie81917cf19819e159195a50d6ad786d20c32136c

Former-commit-id: fc261ab303 [formerly 7b2ed421f0] [formerly 2a0775e748] [formerly fc261ab303 [formerly 7b2ed421f0] [formerly 2a0775e748] [formerly 76ad31501b [formerly 2a0775e748 [formerly 8df8db0d9b9cc0848bf73a09bcedb8cb7947a4bb]]]]
Former-commit-id: 76ad31501b
Former-commit-id: 3634889dab [formerly ffb294cab4] [formerly cf11210c48f3e873f15155bc8644fb9af1296446 [formerly 191f6c3385]]
Former-commit-id: a264003449737f399c4846d23735afced10fd273 [formerly ee285cfc57]
Former-commit-id: 4669a93a96
2014-05-01 11:01:37 -05:00
Brian Clements
542b75e5be Issue #2903 set commons.lang to unpack in feature to fix odd bug
collaboration gets in a state where commons.lang is no longer found
setting unpack to true might help


Former-commit-id: fe53a23d2c [formerly fee0a858cb] [formerly 873efa1c64] [formerly fe53a23d2c [formerly fee0a858cb] [formerly 873efa1c64] [formerly f45e435f2c [formerly 873efa1c64 [formerly b27a714c2cbdf2f13eb0c494ace4cbd016ef8132]]]]
Former-commit-id: f45e435f2c
Former-commit-id: 00e7061f42 [formerly 20830253ba] [formerly f9367f0487bc002acf5cc3b4733af6b6d9b49a24 [formerly c187523782]]
Former-commit-id: 1a699056f312f4be2eb1ef65d741ba8d01a416f7 [formerly c3d2b4be86]
Former-commit-id: 4c1a6b44c8
2014-04-30 17:52:43 -05:00
Richard Peter
68474fb70c Merge "Issue #2992 Updated DD list of active registries Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca" into omaha_14.3.1
Former-commit-id: 83658fcbb5 [formerly d28c4fdbae] [formerly de9eb60629] [formerly 83658fcbb5 [formerly d28c4fdbae] [formerly de9eb60629] [formerly 86ddd480c1 [formerly de9eb60629 [formerly 4e6364a24d5f9354946455218cc394fbda4a11ed]]]]
Former-commit-id: 86ddd480c1
Former-commit-id: 9ee5b7c648 [formerly d961ff6edc] [formerly 75220412d93558970dc725fce5312cce7866166d [formerly 6ecb5018b6]]
Former-commit-id: f6db2a6fbbc579ddd2e876bdea84339cafc85568 [formerly dd54408a10]
Former-commit-id: cfb980db11
2014-04-30 17:43:50 -05:00
Dave Hladky
5fa53b22dc Issue #2992 Updated DD list of active registries
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca

Former-commit-id: a14cb8c45f [formerly e2a4bb6755] [formerly c352643c79] [formerly a14cb8c45f [formerly e2a4bb6755] [formerly c352643c79] [formerly 3b00ae03cc [formerly c352643c79 [formerly a34955102d1316135c4151210daba0e5807ff6c9]]]]
Former-commit-id: 3b00ae03cc
Former-commit-id: 5fc17cf3b8 [formerly ea791b5ca5] [formerly 271120a82cffba35438f0b9830c3a47c736fcb73 [formerly bf42c8d740]]
Former-commit-id: 966b34bc10a6cb76f151b577b0acae7fb953d804 [formerly 5b11e45636]
Former-commit-id: a06db5a4e7
2014-04-30 17:38:28 -05:00
Nate Jensen
c3ff2e1ad4 Merge "Issue #2860 - Fix to not create empty substitution tags" into omaha_14.3.1
Former-commit-id: 580a95ed41 [formerly f6f9169aef] [formerly 1eade4f434] [formerly 580a95ed41 [formerly f6f9169aef] [formerly 1eade4f434] [formerly f005d2f31c [formerly 1eade4f434 [formerly aebaae7802e5429eed3ebc39ae9be45568912d8a]]]]
Former-commit-id: f005d2f31c
Former-commit-id: 299cb28462 [formerly a6df4bd2b2] [formerly 32bb783c21f96ad95b5837b59bfa30c95ba65a23 [formerly b98328113b]]
Former-commit-id: 9716e295e2aaeb50ef7f01c9a4b5eed9b69ac807 [formerly 9b3282fabf]
Former-commit-id: bf92253e0f
2014-04-30 15:16:11 -05:00
Ben Steffensmeier
3a60f93af0 Issue #2946 Fix auxillary purge rules.
Former-commit-id: 8449ec8f22 [formerly bcc02476c6] [formerly 2850d80610] [formerly 8449ec8f22 [formerly bcc02476c6] [formerly 2850d80610] [formerly 4c06cd6f5e [formerly 2850d80610 [formerly a62bdff82f96e79737269686598687ecef746c01]]]]
Former-commit-id: 4c06cd6f5e
Former-commit-id: 410b30ef15 [formerly 076165515a] [formerly a295c948db1f2e4e6f82577553e64171a8f2dc5a [formerly e51a0dcb13]]
Former-commit-id: ab8dc894e2ec9095c6047bed69f4981b7f63857d [formerly 749e7fa56d]
Former-commit-id: c92d5785c9
2014-04-30 14:38:27 -05:00
Nate Jensen
a11f0d304c Issue #2060 fix FFG processing
Change-Id: I2338c4b311e1d660bc53933633c645e07a1687b0

Former-commit-id: acfcaea04e [formerly 2d19ee46e5] [formerly 8cbea21f32] [formerly acfcaea04e [formerly 2d19ee46e5] [formerly 8cbea21f32] [formerly 9b19f95d24 [formerly 8cbea21f32 [formerly 14ce9854abc51b2791b5f93756ae12cbe69b8589]]]]
Former-commit-id: 9b19f95d24
Former-commit-id: 65ad418a94 [formerly 9a2c674142] [formerly 94b4ede51617e66b1e18ddaa60775457c6b2c3ad [formerly a33ca4e3ac]]
Former-commit-id: 3b5d2fc28c192ce41c0bfe1d25e5582a85ee8e04 [formerly 58618a1842]
Former-commit-id: eb5dd811ca
2014-04-30 13:08:26 -05:00
Brian.Dyke
f4856aae4d Merge branch 'master_14.2.2-6' into master_14.3.1 (at 14.3.1-2)
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionTableComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/web/RegistryDataAccessService.java
	edexOsgi/com.raytheon.uf.edex.ogc.registry/src/com/raytheon/uf/edex/ogc/registry/RegistryCollectorAddon.java

Former-commit-id: 2e687fbfb7 [formerly e56bd61ee6] [formerly 278aab6b6f] [formerly 2e687fbfb7 [formerly e56bd61ee6] [formerly 278aab6b6f] [formerly 63137ed69c [formerly 278aab6b6f [formerly 64c3766ed570885a796f846b889d40413e8250c6]]]]
Former-commit-id: 63137ed69c
Former-commit-id: 624606c9dd [formerly fcf13ae9f7] [formerly 07e5d6948695c16b1561033e2f9374a9e992b03e [formerly 8160209e52]]
Former-commit-id: ff65ed48a968bb0c306792bbf8ffaff1d87d8edf [formerly 5d31c9ec9a]
Former-commit-id: f16c305ae4
2014-04-30 12:57:09 -04:00
Mike Duff
458bcee21e Issue #2860 - Fix to not create empty substitution tags
Change-Id: I6734c61103b5bf9db3c27adfe0305cb5eb60d4ff

Former-commit-id: 2b1116f380 [formerly 90895cf316] [formerly 60bfadd865] [formerly 2b1116f380 [formerly 90895cf316] [formerly 60bfadd865] [formerly c0b2a19a2f [formerly 60bfadd865 [formerly ecd5428e2adad5a0b8022d4a89a13a5a4d549dc1]]]]
Former-commit-id: c0b2a19a2f
Former-commit-id: e5572a5cd0 [formerly 1e84cb07c2] [formerly b8d16c9b3441a0ac07d22e0891f1c3ff651d8b8d [formerly 0601068b03]]
Former-commit-id: 51a58accf1071311a755ab513c7f0bd32f4500c0 [formerly 927e8ffcbb]
Former-commit-id: ac6147c463
2014-04-30 10:17:56 -05:00
Richard Peter
ae3f94e875 Merge "Issue #3081 Use alias in derived paraemters less." into omaha_14.3.1
Former-commit-id: 15d4373fa5 [formerly 74b2cdfe34] [formerly 4ae87dcece] [formerly 15d4373fa5 [formerly 74b2cdfe34] [formerly 4ae87dcece] [formerly 9dafb3b9e3 [formerly 4ae87dcece [formerly 8a391cdc5dd83088eeb22ebe6ad17e5aefc72cf0]]]]
Former-commit-id: 9dafb3b9e3
Former-commit-id: 3c2ff2733b [formerly f381290ed1] [formerly 87db6e727009d9903d97b834ac5727197c5c6117 [formerly 9663a83d1f]]
Former-commit-id: 113b0b8e619130b9ec6b0fe3a7c274afee04d1dd [formerly 1488bb27f8]
Former-commit-id: 6668196c3d
2014-04-29 16:14:52 -05:00
Ben Steffensmeier
fda1c02fb1 Issue #3081 Use alias in derived paraemters less.
Former-commit-id: fe893aa216 [formerly fe5d69c896] [formerly 1d38fb2df1] [formerly fe893aa216 [formerly fe5d69c896] [formerly 1d38fb2df1] [formerly 60a7f64a5e [formerly 1d38fb2df1 [formerly cdbfab27991a9536e48436c084801eb507322e7c]]]]
Former-commit-id: 60a7f64a5e
Former-commit-id: 57f185dd72 [formerly f31d7f826b] [formerly 597f015753893b012533c8d051366fb27a6f6d18 [formerly 539a32666b]]
Former-commit-id: da9381bf6b755d77e05b1e421abebbb397ec6947 [formerly d4d1e28775]
Former-commit-id: b2c93dda87
2014-04-29 15:43:08 -05:00
Ben Steffensmeier
9197afe1d2 Issue #3080 add NaN conversion to Slice.py
Former-commit-id: 96ebfc4ae9 [formerly eb9a0398df] [formerly 156c25fb9c] [formerly 96ebfc4ae9 [formerly eb9a0398df] [formerly 156c25fb9c] [formerly 5959b17732 [formerly 156c25fb9c [formerly 084a209f64cf9deb527414500c368ea397b9e3a4]]]]
Former-commit-id: 5959b17732
Former-commit-id: 08442c513a [formerly 8a1b16d15e] [formerly b1afe65ee8b094ce8f0e0dd9ca0140878d1a13d8 [formerly ca8cd9fb43]]
Former-commit-id: 3115849b6ade83f809adceb6ed06ab2f79e71325 [formerly 3be0087fb9]
Former-commit-id: af80e94349
2014-04-29 15:35:29 -05:00
Roger Ferrel
be6b9a2db6 Issue #3036 Added check for archive's root directories.
Former-commit-id: fa703c0060 [formerly 039e4b5209] [formerly 7a2775ecbc] [formerly fa703c0060 [formerly 039e4b5209] [formerly 7a2775ecbc] [formerly 3259d4d44d [formerly 7a2775ecbc [formerly f344acf3572150c7470ab1e3c3bbb356166c78ff]]]]
Former-commit-id: 3259d4d44d
Former-commit-id: a447baa5a0 [formerly 39f7eb1ecc] [formerly c60f0141107a305c80631ce1cee234f0b2f3d1d4 [formerly f71aee1e36]]
Former-commit-id: 5be90d0016ef7703bbda9ec332f33b977a87956f [formerly d9015cddb4]
Former-commit-id: 6751691433
2014-04-29 14:15:11 -05:00
Brian Clements
f23d3ea0b9 Issue #2906 added close to BUFR parser
close netcdf file to solve NFS clean issue


Former-commit-id: c0aef972af [formerly abb14c67e7] [formerly 5beb3be2e8] [formerly c0aef972af [formerly abb14c67e7] [formerly 5beb3be2e8] [formerly a1e416da97 [formerly 5beb3be2e8 [formerly 9675e997369e39455aacadcd72d0d8476f6c7ffc]]]]
Former-commit-id: a1e416da97
Former-commit-id: ad5be1cf6a [formerly 9f1856a6f0] [formerly 1db57f8f23775052064fa72045bb94286cb51a8a [formerly a2c0ba7f0b]]
Former-commit-id: 5477acd025c32c871813f6cc7da0b7a66884ce37 [formerly f03c6cdcf9]
Former-commit-id: 3c8a573a48
2014-04-29 13:48:00 -05:00
Brian.Dyke
2e187af9e4 Merge branch 'master_14.2.1' into master_14.2.2
Merge (14.2.1-21 into 14.2.2-5)


Former-commit-id: 7364553aea [formerly c5e29cc46a] [formerly 35b637c3e2] [formerly 7364553aea [formerly c5e29cc46a] [formerly 35b637c3e2] [formerly bdda2e9a7a [formerly 35b637c3e2 [formerly 9a017e543fc6be9fd0d7b9361bd2226bf2af6211]]]]
Former-commit-id: bdda2e9a7a
Former-commit-id: fba8753c81 [formerly f8c3dca497] [formerly 864697ab3fb4d67896d81f6bc98951da3ad837df [formerly 59f34e3108]]
Former-commit-id: 756d936948a5f4a794262ababc0423b3b1e3dbfe [formerly 85bf52ef22]
Former-commit-id: 1aec51b7c4
2014-04-29 12:07:21 -04:00
Richard Peter
e748b7c1e5 Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml

Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900

Former-commit-id: 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]]
Former-commit-id: 32957285fc
Former-commit-id: 0dfa8cc4c6 [formerly 6966b79246] [formerly 2a324b0264c6962014f41df55690c7e2b09955e1 [formerly 80d4153878]]
Former-commit-id: 5715dc841fc8db519f94f6126094e2ff4eb83ea8 [formerly 24a3fe1466]
Former-commit-id: 938e39a0fc
2014-04-28 16:27:40 -05:00
Dave Hladky
31e6954167 Issue #2940 Better error message for bad XMRG config in FFMP
Former-commit-id: a0a4085459 [formerly dc3b99cbf4] [formerly 2f4c0cd364] [formerly a0a4085459 [formerly dc3b99cbf4] [formerly 2f4c0cd364] [formerly 82be445e97 [formerly 2f4c0cd364 [formerly dfa3f534b96852975afcd13a6bed653b0f3b8f40]]]]
Former-commit-id: 82be445e97
Former-commit-id: c4212d6252 [formerly 0ea0313cb8] [formerly 5da6cb0fddc03077fb72a39deee5bf043b26cdcb [formerly 3df985a26a]]
Former-commit-id: 16e764fba29e55076fcc6ab1f0cab2f135cb0a91 [formerly a6743a220a]
Former-commit-id: 47d7ed5017
2014-04-28 11:04:35 -05:00
Richard Peter
67a38126d0 Merge "Issue #3000 fix common.dataplugin.bufrmos manifest" into development
Former-commit-id: dd3a378a6a [formerly 5a0083987b] [formerly 98b35d30c0] [formerly dd3a378a6a [formerly 5a0083987b] [formerly 98b35d30c0] [formerly b06172a798 [formerly 98b35d30c0 [formerly d338c2ad7562c6c86915c9e95d2aeca35d401586]]]]
Former-commit-id: b06172a798
Former-commit-id: d45dae2155 [formerly c7882721b2] [formerly 5bda710ce91c29365a5685d0cfa858a81e171800 [formerly f5f6ff0008]]
Former-commit-id: 6f48441c6373c0ec087caa69ab0464b5070630aa [formerly bac20bb9dd]
Former-commit-id: 4ac0d62d7c
2014-04-25 14:57:51 -05:00
Nate Jensen
2f39b6eb88 Merge "Issue #2629: Update capture to grab Xorg log files." into development
Former-commit-id: 23487630e4 [formerly d425f134ae] [formerly 4842f08165] [formerly 23487630e4 [formerly d425f134ae] [formerly 4842f08165] [formerly 9a46583271 [formerly 4842f08165 [formerly 4dc1938de1bd30ac5223a1c0a6748139454ddc2e]]]]
Former-commit-id: 9a46583271
Former-commit-id: a847ecddfa [formerly 1d6014f363] [formerly 40b297f2098fb561c5a1c6c26494e2f2273f285a [formerly acfc3c2b20]]
Former-commit-id: 94e69def4d9c026f69b3aa3df39355f486b5e5fe [formerly ac0b4dc1f2]
Former-commit-id: 8f87fdc431
2014-04-25 14:57:47 -05:00
Richard Peter
cfd219f2bb Issue #2726: Make SmartInit shutdown more gracefully
Change-Id: I1a5514e75645083a1d8fa8a771ac33ea8fd39fe7

Former-commit-id: 06d58b0472 [formerly 1781500740] [formerly 36742a30f3] [formerly 06d58b0472 [formerly 1781500740] [formerly 36742a30f3] [formerly 6918dc0026 [formerly 36742a30f3 [formerly 93f8af097d2a04e054e1c3d0ae0b7d62ca30892e]]]]
Former-commit-id: 6918dc0026
Former-commit-id: 4e1a30b4d9 [formerly 433d5a77f6] [formerly e1f4de7e6f2ee07e043c48c470ad8d5b1a46686a [formerly 52e821b5bb]]
Former-commit-id: 983a1eeebf0004a7badd7ac01293b0008554a0e2 [formerly 5a49b7e345]
Former-commit-id: 6775b0dce6
2014-04-25 14:53:22 -05:00
Nate Jensen
145651f252 Issue #3000 fix common.dataplugin.bufrmos manifest
Change-Id: I4f414ad2cc3d147badb0196a03ba152c9a74dccf

Former-commit-id: bf46b40f6e [formerly 3719815807] [formerly deda54488f] [formerly bf46b40f6e [formerly 3719815807] [formerly deda54488f] [formerly ca2cc7f11d [formerly deda54488f [formerly c91c2477aeff207ff253bce22b4fea57a7172d5c]]]]
Former-commit-id: ca2cc7f11d
Former-commit-id: d4f4a1ab8c [formerly 4b24593f10] [formerly 81071d64de116e6f7c310d72f0fca7fcacb07ab3 [formerly 619af04a23]]
Former-commit-id: a098e1487df3ed0941d2d84f3c92b8b7e6d71017 [formerly 83864b0ff0]
Former-commit-id: 3c4a864333
2014-04-25 14:51:45 -05:00
Richard Peter
2652a4d9b0 Issue #2629: Update capture to grab Xorg log files.
Change-Id: Ic6d4806bee75894805fb7fa5882d3b454418c26d

Former-commit-id: fd0662eb07 [formerly 5fb2aef966] [formerly de249decab] [formerly fd0662eb07 [formerly 5fb2aef966] [formerly de249decab] [formerly 1cc7977b99 [formerly de249decab [formerly 38ad09697f3e618b6c9edb6592913b2d50014d14]]]]
Former-commit-id: 1cc7977b99
Former-commit-id: 76d5fc88e4 [formerly 3f66895529] [formerly 8adb3a0a5795e22045a287892d0335d8c624a4fe [formerly 7e3d3f3093]]
Former-commit-id: d3cf402b2688a4b9616bd36891bac6b11c859e41 [formerly 92c2f7fa50]
Former-commit-id: 3cbb7cb196
2014-04-25 14:42:53 -05:00
Ben Steffensmeier
d6eadfc34c Issue #2874 Allow RTOFS nowcast to be identified by process type.
Former-commit-id: 214311cc6e [formerly 9478f8adc9] [formerly 2d96d9d2df] [formerly 214311cc6e [formerly 9478f8adc9] [formerly 2d96d9d2df] [formerly fa3d4bb618 [formerly 2d96d9d2df [formerly 1e430dd1227f2e368a7da21d116677a3b522d5ed]]]]
Former-commit-id: fa3d4bb618
Former-commit-id: 5b61473bd6 [formerly 080c2a48f3] [formerly 5a00a4836af355759bf8bd0c0ffa79adcb056d6b [formerly 7499987f52]]
Former-commit-id: 57669c24cddfb753d969f18626729fa9ecf6418f [formerly 86174019b5]
Former-commit-id: 1bb8ce2cbe
2014-04-25 14:38:36 -05:00
Nate Jensen
3d10c5693c Merge "Issue #2060 remove FFG post processor dependency on dataURI, other minor cleanups" into development
Former-commit-id: df22d06b21 [formerly 64a09dbdc6] [formerly cf6992073f] [formerly df22d06b21 [formerly 64a09dbdc6] [formerly cf6992073f] [formerly 0a245df4f1 [formerly cf6992073f [formerly 5b4555f7e94bf952b6e2323685e53e4708a8039b]]]]
Former-commit-id: 0a245df4f1
Former-commit-id: ef52d0db9b [formerly 1e47f6f03a] [formerly d69331f521630baa62047e3b82a9cc06c1b48071 [formerly b67f0a616f]]
Former-commit-id: b5a34768ff4b06283a0daa5c53ceb0c2d5389fe0 [formerly 97d3beb64b]
Former-commit-id: e0f4544f94
2014-04-25 13:26:10 -05:00
Richard Peter
4c24417ff1 Issue #2995: Update DB Class Finder to search all plugin jars
Change-Id: I42b5207372aa9d6f07afff0d18819c60b85fb3f8

Former-commit-id: 1395628200 [formerly 86d1ff9427] [formerly 44701f31f2] [formerly 1395628200 [formerly 86d1ff9427] [formerly 44701f31f2] [formerly 5c0f9b5ba5 [formerly 44701f31f2 [formerly f3fe2db624f7f9e6c7b0b65d600ddba5e42de361]]]]
Former-commit-id: 5c0f9b5ba5
Former-commit-id: 947b9d7423 [formerly baee58476f] [formerly 22e220f4dbde49d7ef5d1ef995a55d8c5ac54cff [formerly 60684de8b4]]
Former-commit-id: f265228af3414b3f057894a3a0918b094b692219 [formerly 231dbfc1b9]
Former-commit-id: 928de60c87
2014-04-25 13:07:59 -05:00
Nate Jensen
ab003ef82a Issue #2060 remove FFG post processor dependency on dataURI, other minor
cleanups

Change-Id: I4c572c3f7d2bef1bdd0b9a596f916e29f8e53410

Former-commit-id: a9f16fe45f [formerly d9ad750a99] [formerly 7da49c00f5] [formerly a9f16fe45f [formerly d9ad750a99] [formerly 7da49c00f5] [formerly 74b3181107 [formerly 7da49c00f5 [formerly b45cdd1a3f4742937b9085ca70d538ae724d6aab]]]]
Former-commit-id: 74b3181107
Former-commit-id: bcece2286a [formerly f6f962691f] [formerly a8aa65177362b3434658cd408da84eccb363f5c0 [formerly d0dfb21b6e]]
Former-commit-id: 4f53f94e10d54d4786ed64e6ad969eec18789654 [formerly f4b040fe4d]
Former-commit-id: af6ed8d300
2014-04-25 12:19:23 -05:00
David Gillingham
b68680eb65 Issue #2897: Add support for Multi-grid Hurricane Wave Models to D2D and GFE.
Change-Id: I66e609d17afcfc900ceaf1b1eed328320d022fbb

Former-commit-id: 777456404b [formerly c14497b1b7] [formerly 2426e463f7] [formerly 777456404b [formerly c14497b1b7] [formerly 2426e463f7] [formerly 6ca193b8e9 [formerly 2426e463f7 [formerly 33197dc6708b65e85233b51be1e99e6411ece60f]]]]
Former-commit-id: 6ca193b8e9
Former-commit-id: 8db5524b3f [formerly 48bc49fd4b] [formerly cc410719114014fd14ea4e485ad8351678818e80 [formerly 2e8b8c6e86]]
Former-commit-id: c46af48dc3a4136893d9194d27b43b98838b448d [formerly c0fd32360d]
Former-commit-id: 83674f8444
2014-04-25 10:56:43 -05:00
Brian.Dyke
19b4bb7dcc Merge branch 'master_14.2.2' into master_14.3.1
Merge (14.2.2-5 into 14.3.1-1)

Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java

Former-commit-id: 362d882b40 [formerly f0b8ea5822] [formerly fb1f5aa593] [formerly 362d882b40 [formerly f0b8ea5822] [formerly fb1f5aa593] [formerly 3524838f9f [formerly fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]]
Former-commit-id: 3524838f9f
Former-commit-id: 14a63a19e1 [formerly bf3758efa3] [formerly bb5a7e713dac6962660d9c769971464b6792cb76 [formerly 029f5753ad]]
Former-commit-id: 4f6c777830575250a298510d89cfba1ef9df9753 [formerly c6d3fe6952]
Former-commit-id: f31d8cc8cf
2014-04-25 11:06:11 -04:00
Richard Peter
59e6007512 Merge "Issue #2726: Add hooks to stop archiving processes during shutdown." into development
Former-commit-id: 1c3ef27a2e [formerly 5b3ffb51b0] [formerly 0b765efce0] [formerly 1c3ef27a2e [formerly 5b3ffb51b0] [formerly 0b765efce0] [formerly 225d95171c [formerly 0b765efce0 [formerly 98e0a18741b559dff887db980d95965edf5f7cae]]]]
Former-commit-id: 225d95171c
Former-commit-id: 93f4506b56 [formerly 7371d8ccdd] [formerly 5b0d5aaeb3bc30824dd69cc2f33ba21d62369299 [formerly 02d1cf94b0]]
Former-commit-id: 1ec144b5e8bc17e595939fa1aeb1ad50b2f87142 [formerly e628067527]
Former-commit-id: 15e9fe0da3
2014-04-24 19:15:56 -05:00