Commit graph

1635 commits

Author SHA1 Message Date
Richard Peter
c9dd98496b Issue #1473: Fix Alarm Alert NPE
Change-Id: If9208dbed2b4b25c2dbedd4d7058b347028d9fff

Former-commit-id: f1dc664a00 [formerly 1d61d65a1e] [formerly a4f3a2a174] [formerly e71db46db9 [formerly a4f3a2a174 [formerly ed157e199cb95e5db44095b638332bb9563548d5]]]
Former-commit-id: e71db46db9
Former-commit-id: 20466293ab658f7939eaea6be47b45f720037a67 [formerly 8ea3bb4d17]
Former-commit-id: c68dcf4554
2013-01-14 09:59:28 -06:00
Richard Peter
dd12b3fe0f Merge "Issue #1453 Fix handling of active period across year boundary" into development
Former-commit-id: dc6c7afd42 [formerly 58242a600c] [formerly 32e5d79e7a] [formerly a2c3db2ee7 [formerly 32e5d79e7a [formerly 5b08568c4f07da6d5916025e076260b0f469a68c]]]
Former-commit-id: a2c3db2ee7
Former-commit-id: 0dc63b9bd4f59e8fed895f177efe7f6278747845 [formerly d3df89181f]
Former-commit-id: cf815a4c72
2013-01-11 12:37:05 -06:00
Richard Peter
b0050959af Merge "Issue #1346 - added addtional information to the data browser dataset details dialog" into development
Former-commit-id: 7f595074ae [formerly c309d2dc1e] [formerly a595356025] [formerly f9e39660d4 [formerly a595356025 [formerly 410b7e917c48645ef1337b531e18bdb4cbe7fc4f]]]
Former-commit-id: f9e39660d4
Former-commit-id: 1c18c0a235839ef85ff98f2d1031b2307daefd8d [formerly b9e409357d]
Former-commit-id: ff1dc7e236
2013-01-11 12:25:54 -06:00
Richard Peter
0be75cba3c Merge "Issue #1444 - Fix updating subsets by loading a saved subset from the saved subset tab. Change-Id: Ibc6b93fd8a9d7a9fdf07b28d77f4f32e706ae05a" into development
Former-commit-id: 3ef137ee36 [formerly 31c1c5e71b] [formerly 130e9151d2] [formerly a3429f5ca1 [formerly 130e9151d2 [formerly 3afdc1e33555448ab7863858cc1d6496b545b5c8]]]
Former-commit-id: a3429f5ca1
Former-commit-id: 26c3d3ceb7c0b959420d9211713244167a32b8e3 [formerly c0655734e7]
Former-commit-id: d01c8c70b4
2013-01-11 12:25:20 -06:00
Dustin Johnson
2a306b4122 Issue #1453 Fix handling of active period across year boundary
Change-Id: I6bd5f075d74d394eab2a47a2b5fee3e2d91fd272

Former-commit-id: f7fa425488 [formerly 3e1878c5f9] [formerly 7716f1baa9] [formerly c4068d27bf [formerly 7716f1baa9 [formerly eb1c45cff6c9b0a6b5d194e8f5b9b582646ebde2]]]
Former-commit-id: c4068d27bf
Former-commit-id: c86a35d61a0a7c32f9505c7606fcb5598beded97 [formerly 0b3f803f6c]
Former-commit-id: a4414d409a
2013-01-11 12:23:15 -06:00
Mike Duff
d5f9aefec0 Issue #1444 - Fix updating subsets by loading a saved subset from the saved subset tab.
Change-Id: Ibc6b93fd8a9d7a9fdf07b28d77f4f32e706ae05a

Former-commit-id: c12824d7bf [formerly 16a86f47e6] [formerly 35d73f0354] [formerly 4cbe807a52 [formerly 35d73f0354 [formerly 843a771d3c6247326d1e832eb598072f7c313499]]]
Former-commit-id: 4cbe807a52
Former-commit-id: 076bb9b030781d1f36bd984fff6daf176073a6f4 [formerly 98ec2a5269]
Former-commit-id: c498087b96
2013-01-11 12:22:47 -06:00
Dave Hladky
59c349ac77 Issue #1466 Updated parsing for NCOM, revamped MetaDataParser to make more efficient, unit updates, tests, params
Change-Id: I5177209c25cb08c0ffe74104ceb6e16874ce3208

Former-commit-id: b56b5c1fe8 [formerly 440de708df] [formerly 5cf3eee426] [formerly 002ac2eb41 [formerly 5cf3eee426 [formerly 9b8169d2523480750bb3cf557fb8902a9cafcc03]]]
Former-commit-id: 002ac2eb41
Former-commit-id: 6a98f7fe2876ba19787aa908c721669aaf618444 [formerly 5312e82b4b]
Former-commit-id: fe486b4889
2013-01-11 11:59:36 -06:00
Richard Peter
ed2e9c59e1 Merge "Issue #1441 Cleaned up editing/deleting groups and handling of user permissions" into development
Former-commit-id: d3bb78a262 [formerly eaf0cbc118] [formerly dd2f1044c2] [formerly c5338da7be [formerly dd2f1044c2 [formerly 08646c4b84f2e86507452dabf30228e0a0c96528]]]
Former-commit-id: c5338da7be
Former-commit-id: 93b5bc836fb851dfa8b1af7af168a935aaef9ded [formerly afbc50da00]
Former-commit-id: 6c5c815c0b
2013-01-11 11:55:23 -06:00
Dustin Johnson
6984791be8 Issue #1441 Cleaned up editing/deleting groups and handling of user permissions
Amend:
  Split creation and edit group dialogs.
  Add some javadoc and remove sysouts.
  Add missing test data causing broken tests.
  Rebased.

Change-Id: I00d48f2a97bf8398b74bf8ed568cb19126d2c185

Former-commit-id: b128ed3340 [formerly 8473eb60fb] [formerly 4ae1a9645c] [formerly 446f65776e [formerly 4ae1a9645c [formerly 797f570e28086b43b5d851275fba457c5920f57e]]]
Former-commit-id: 446f65776e
Former-commit-id: 23c340a1e9db08699dd6472e0937d44ae0e67cc5 [formerly 64ececeda1]
Former-commit-id: 7bf029eb7e
2013-01-11 11:53:02 -06:00
Ben Steffensmeier
3f17e60975 Issue #1470 remove times from grid resources when updates arrive.
Former-commit-id: b210023c96 [formerly 6e7b5a0e3d] [formerly 211a9b6cee] [formerly a1afabe4e3 [formerly 211a9b6cee [formerly 355bd4c62d4f56064341930145ad2a29cb807eed]]]
Former-commit-id: a1afabe4e3
Former-commit-id: b4a7ccd68b59466072f1a849836b8ea6dc674c1c [formerly 7b6bc3f69b]
Former-commit-id: 3b72ea7f19
2013-01-11 11:46:32 -06:00
Richard Peter
c889337379 Issue #1472: Fix GFE queryByD2DParmId to include required level in query
Change-Id: I3bedb92ce79dbf5fca3f96293b7474011d701751

Former-commit-id: 169e239175 [formerly f9e89ee518] [formerly d36faee34e] [formerly 8d1cc52ba7 [formerly d36faee34e [formerly d7835ba3e0d450f10b8ad191b5ebd7c6df4654c8]]]
Former-commit-id: 8d1cc52ba7
Former-commit-id: 3ffa5df29311f58109b1f282d144e85b5751c9af [formerly 7e4a0f1377]
Former-commit-id: e23ffee8bd
2013-01-11 11:03:42 -06:00
Matt Nash
0e04e3e1d2 Issue #1471 fix product browser issues
Change-Id: Ic37ef8f288a4949d13db75b27e7aebb03c8e3062

Former-commit-id: 3f6ffe12e3 [formerly 0a8448cfed] [formerly 90fa08596e] [formerly 6bfbf6b0e3 [formerly 90fa08596e [formerly 87ca33679bc3b6ff5fbfffd1f95398b255de9137]]]
Former-commit-id: 6bfbf6b0e3
Former-commit-id: dc95ddec2b8f59c1d1a2eb1f098a077fdf7a1dd2 [formerly addac12b84]
Former-commit-id: 1ab332b654
2013-01-11 10:48:06 -06:00
Dustin Johnson
25a4e68f25 Issue #1412 Add common useradmin code to PDE build for EDEX
Change-Id: I5d676ff43dbe89c2e6a2f48e373704cbf38e42bc

Former-commit-id: 61764bac16 [formerly 6cc28be958] [formerly ede32c8d3e] [formerly f316320b06 [formerly ede32c8d3e [formerly 39d60f23ea246e17924c78562c45cc0b6491a53d]]]
Former-commit-id: f316320b06
Former-commit-id: b6ddfc6f49195136d5d7d440c3e182fdd9538e9b [formerly 35409872a6]
Former-commit-id: f274ce63e9
2013-01-11 08:56:39 -06:00
Richard Peter
60392a7a7c Merge "Issue #1432 - Fix case sensative and exclude check boxes." into development
Former-commit-id: cea19a313a [formerly 942140cca5] [formerly cffe035019] [formerly e91b5bd035 [formerly cffe035019 [formerly 8da35969c383bb7d22e5f629859311d8783069dc]]]
Former-commit-id: e91b5bd035
Former-commit-id: 4a63d9342225528410d684780a44036549f31886 [formerly 6857211fc6]
Former-commit-id: c4c2ae3256
2013-01-10 17:25:09 -06:00
Richard Peter
9d0c8ff714 Issue #1454: Update Dataset size calculation
Change-Id: I5653bc1614945fb0dad2eec757e1de0831b809d5

Former-commit-id: 9405cb94ae [formerly 45e6e286bb] [formerly deca70207d] [formerly 73263e270e [formerly deca70207d [formerly 345344ed47305bc0698eec29cbae7e7922378cc7]]]
Former-commit-id: 73263e270e
Former-commit-id: 9f6c7c2bc9e428381b9ce3bd65c4d503ebf7348a [formerly 69818573a6]
Former-commit-id: 4a097586f6
2013-01-10 17:17:58 -06:00
Mike Duff
c21d02d8fb Issue #1432 - Fix case sensative and exclude check boxes.
Former-commit-id: 7ba0d71d7c [formerly d2981a8275] [formerly 9526199a9c] [formerly 78440f2b5a [formerly 9526199a9c [formerly 29d620050a3b2aefd2b9eda664e3139e146558be]]]
Former-commit-id: 78440f2b5a
Former-commit-id: c2ca6a0936930afda3caca73c5ca608bee2b795a [formerly bde6be532e]
Former-commit-id: f2da1df6e6
2013-01-10 15:35:33 -06:00
Mike Duff
f167689caf Issue #1346 - added addtional information to the data browser dataset details dialog
Former-commit-id: 38aae63ee3 [formerly 674ddfedb2] [formerly 02bfe05a27] [formerly b72c2e4b04 [formerly 02bfe05a27 [formerly 682e4831f76b3a220aeedb9fc292886f24582e72]]]
Former-commit-id: b72c2e4b04
Former-commit-id: 6d7445bf13f8b180941b8fd9b135ad41b909c4c8 [formerly b42395d6ea]
Former-commit-id: 8b23902cea
2013-01-10 12:26:59 -06:00
Dustin Johnson
2c21da07a8 Merge "Issue #1441 Break net.dods dependency on AWIPS code" into development
Former-commit-id: a40a0fc79b [formerly 5a861267aa] [formerly 7d67bd5949] [formerly d5fcc68163 [formerly 7d67bd5949 [formerly 45b7e01839ef90c8623c3c5b8f2c873997e90111]]]
Former-commit-id: d5fcc68163
Former-commit-id: e3e253eb0720cac3fa541b01c0f9dc5674f3e281 [formerly c6609e8ea8]
Former-commit-id: 048606bae5
2013-01-10 12:25:04 -06:00
Dustin Johnson
773a3303da Issue #1441 Break net.dods dependency on AWIPS code
Change-Id: I13289bff3f3ea80317a858f8a32cc280b1ac0480

Former-commit-id: 3c2ace6854 [formerly 3ebe0cf1ca] [formerly ddcc816bba] [formerly c00f5f394a [formerly ddcc816bba [formerly 010eabebb27f6a2571ffb2a09e1715cb84c57ce9]]]
Former-commit-id: c00f5f394a
Former-commit-id: 4fdeee1cd88dd8b672dbfac13924276692db343f [formerly c29d2e2e71]
Former-commit-id: 59a209e77d
2013-01-10 12:06:39 -06:00
Ron Anderson
e7183ae0e3 Merge "Issue #1395 Fixed dynamic update of opacity." into development
Former-commit-id: d8dfa9bbe3 [formerly bbc314f50c] [formerly 9d3405dd68] [formerly 001bdc84b9 [formerly 9d3405dd68 [formerly f3a9eed298a3b776f8b2b83416e8f98981d92912]]]
Former-commit-id: 001bdc84b9
Former-commit-id: 795b0d31396f9a41839a015e5e8cc8e5ecf706db [formerly c0e80aa175]
Former-commit-id: cd33ded3e7
2013-01-10 11:40:43 -06:00
Richard Peter
d3c6e55c17 Merge "Issue #1420 - Rules Peer review comments" into development
Former-commit-id: 48355758a8 [formerly 206ffc0e15] [formerly 507a3d641c] [formerly c0e712f682 [formerly 507a3d641c [formerly eded38dc13847cc764bcc4cb71997b8abb685c89]]]
Former-commit-id: c0e712f682
Former-commit-id: 97734a3cd0f5afa0b7002ff04016137bde675235 [formerly 9543d23d23]
Former-commit-id: 9524f5a52b
2013-01-10 10:51:28 -06:00
Nate Jensen
cce4bebbe5 Merge "Issue #1467 - updated the memory settings for 64-bit GFE" into development
Former-commit-id: a9410160a8 [formerly d02e1ff0a7] [formerly a3e10f6dcd] [formerly 62f89e6189 [formerly a3e10f6dcd [formerly 5f262d2cb46ad8ff0ec355e64ee73b6deb7ed454]]]
Former-commit-id: 62f89e6189
Former-commit-id: d12f5df726ebd0677bc478849410246bfac0e228 [formerly 5733a44770]
Former-commit-id: ef3468acd4
2013-01-10 10:31:05 -06:00
Richard Peter
a4491237e5 Merge "Issue #1412 User Admin dialog should refresh with changes made to authentication data" into development
Former-commit-id: b91a1d35c9 [formerly e1547982b0] [formerly ee6513bad3] [formerly 2d1a6c4833 [formerly ee6513bad3 [formerly 5f26573ba4c0881e1ee6c7a4809f9465589164a1]]]
Former-commit-id: 2d1a6c4833
Former-commit-id: 6a4957abee715c7f29e3637d9ceac8248e81d07d [formerly 46faa0f68d]
Former-commit-id: 27a06e14b8
2013-01-10 10:18:39 -06:00
Ron Anderson
1b4acc66e9 Issue #1395 Fixed dynamic update of opacity.
Change-Id: Ic552a759c23035dfe2d830323d4dbe170e0d0187

Former-commit-id: 7b8eba7461 [formerly 37d6ed5232] [formerly 145665c496] [formerly 3df3cf7f7b [formerly 145665c496 [formerly cae505a088e959670f4cacb92e439a82f13559b9]]]
Former-commit-id: 3df3cf7f7b
Former-commit-id: 394db5ca0b53e186b2f8d6e2619a70bcb1da53e8 [formerly 1f298b87b5]
Former-commit-id: 2c364744bb
2013-01-10 10:00:56 -06:00
Richard Peter
a087382c29 Merge "Issue #1465 fix import derived parameter." into development
Former-commit-id: 9c8e6f4821 [formerly 856959f0d5] [formerly 9293a7e3f7] [formerly 86f5fec292 [formerly 9293a7e3f7 [formerly cfc04313c76c75db5a5bd7bc1bd32577a4615974]]]
Former-commit-id: 86f5fec292
Former-commit-id: b23d495cfd926780e9fd7dc20182c74bf12ff64a [formerly 68f8878d4f]
Former-commit-id: fa41b57e14
2013-01-10 09:35:16 -06:00
Richard Peter
177a54d19a Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: 95f0508c29 [formerly d0a6ba23e5] [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 029ebaa63a [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]
Former-commit-id: 328be6ac2b
Former-commit-id: e62c56e99c7920d8884c0d3271ccfd750504bf46 [formerly 6a5a0d7d09]
Former-commit-id: 80bf1d7a28
2013-01-09 17:55:05 -06:00
Ron Anderson
bb30c11f3d Issue #1468 Make DataStoreResource update labels when magnification is changed.
Change-Id: I1337db46d620aba6cc8939f4f42b25322dc81a98

Former-commit-id: e9a688e184 [formerly 56364be3ce] [formerly 3acf0edad0] [formerly 5918458b70 [formerly 3acf0edad0 [formerly 473cfc2dbd3406a1602f84daf1ca320228b3b1ed]]]
Former-commit-id: 5918458b70
Former-commit-id: fdc6cbba5506d5e5653610c8effa3ea62d68d224 [formerly 0476d4ccc6]
Former-commit-id: 65327a9221
2013-01-09 15:52:08 -06:00
Dustin Johnson
a010315743 Issue #1412 User Admin dialog should refresh with changes made to authentication data
Change-Id: I407dc061a50bf30cb2b37a5fa3b1fe8c5e63ce23

Former-commit-id: 4ec1b32d09 [formerly bad7b754e5] [formerly b7ed75896b] [formerly a354bac4da [formerly b7ed75896b [formerly 5e89b4f6c1cbb9db68b5ac185ba09ca5a6543e3b]]]
Former-commit-id: a354bac4da
Former-commit-id: 53baf13d05630029a4556dcb8562eff91b689c93 [formerly 0d5bb5ba95]
Former-commit-id: 424a70dbfe
2013-01-09 15:40:36 -06:00
Bryan Kowal
21649e9b6a Issue #1467 - updated the memory settings for 64-bit GFE
Change-Id: I40df3faed89bd23c5e37b81f3a4e6b256b5a2cc3

Former-commit-id: fc4fd81849 [formerly 6129a00225] [formerly 0645a9fe40] [formerly 73bdd66283 [formerly 0645a9fe40 [formerly 2d6bf1e42cb628a5b5af6a261202d01c7fa236fb]]]
Former-commit-id: 73bdd66283
Former-commit-id: 5758de40a9aee192d431736f923321adb98c10b9 [formerly e9dd794082]
Former-commit-id: 777b804edc
2013-01-09 13:03:38 -06:00
Ben Steffensmeier
208269a192 Issue #1465 fix import derived parameter.
Former-commit-id: 815e964ef6 [formerly c0ea76eb90] [formerly 6a2b73b816] [formerly a9ece85f9b [formerly 6a2b73b816 [formerly fb133aac1ba6013e826ff38a29f5f1720127aa53]]]
Former-commit-id: a9ece85f9b
Former-commit-id: caf03a468c5c8579b5784a20c4291c72fd68bb24 [formerly d7c2668b88]
Former-commit-id: 0df360a83a
2013-01-09 12:04:00 -06:00
Mike Duff
65dd6c6f60 Issue #1420 - Rules Peer review comments
Former-commit-id: 86e3e4c397 [formerly f41d525fa3] [formerly 4c63333a96] [formerly 6e0367cdc7 [formerly 4c63333a96 [formerly 9f6756325c5788dd1b98d8f24ab3437993da7dcd]]]
Former-commit-id: 6e0367cdc7
Former-commit-id: 4e7421c22c8ae6fb0dd6d1566ea3fb164aec7691 [formerly 67486aa43b]
Former-commit-id: ed95eae2e3
2013-01-09 12:02:21 -06:00
Ben Steffensmeier
d51e288baf Issue #1362 add null chack in nsharp mouse handler.
Former-commit-id: b6e5e160ea [formerly b05bf7b6e2] [formerly 1186724fa8] [formerly a836aee481 [formerly 1186724fa8 [formerly 4ae38765c9a6815050d30b307b4a364b617c49aa]]]
Former-commit-id: a836aee481
Former-commit-id: c5f3635a2e57e9b55fb0c57ae387ac93fbacbe48 [formerly 3a4661685a]
Former-commit-id: a8b4746176
2013-01-08 18:17:24 -06:00
Richard Peter
e912f050b7 Merge "Issue #1299 Log if invalid forecast index is requested" into development
Former-commit-id: 8f4fc5f338 [formerly c29aad09b2] [formerly c138f7b351] [formerly b43a21f4b5 [formerly c138f7b351 [formerly 5eef3aa833a8940435fe965e060501e27a6c5eec]]]
Former-commit-id: b43a21f4b5
Former-commit-id: 7ef4ee83764c8ee23b17cf63a8a53edcac1527d8 [formerly 42848170a9]
Former-commit-id: 27356fb873
2013-01-08 16:48:09 -06:00
Richard Peter
c4d34cf9fd Merge "Issue #1438 do not log grib ingest" into development
Former-commit-id: b617071350 [formerly fe14e7eeba] [formerly 3386fee25a] [formerly 6e54eea341 [formerly 3386fee25a [formerly f63acd39e8a303be5725c6a1c5e5a6fa0b942c05]]]
Former-commit-id: 6e54eea341
Former-commit-id: bb9fcd548a99b6a6a22f60f2eebab158ed1e3ed6 [formerly a840a6bed4]
Former-commit-id: 54bce1bbd0
2013-01-08 16:47:24 -06:00
Richard Peter
027405d885 Merge "Issue #1436 Fixed selection icon reset, Fixed area text box display check." into development
Former-commit-id: e6d99ad02f [formerly 6b2edffd7e] [formerly f25f22c569] [formerly 6a54b7f4d3 [formerly f25f22c569 [formerly 26e37784cac5ffd690e7280aa394711a3bd86820]]]
Former-commit-id: 6a54b7f4d3
Former-commit-id: 5a9975d4a70f6406f7472ca9c563808a13efa411 [formerly 34bc572bb9]
Former-commit-id: 7b4c0a6750
2013-01-08 16:45:58 -06:00
Richard Peter
f8bd67a319 Merge "Issue #1453 Fix the handling of subscription active period dates." into development
Former-commit-id: f7f6455a5f [formerly dc57c5a282] [formerly fd4d8f2407] [formerly dcbda78944 [formerly fd4d8f2407 [formerly f8edc8238c8e2e115cd776b294c66e572bf00cc6]]]
Former-commit-id: dcbda78944
Former-commit-id: e91d2bffa583b9662d3ae106dbf61734a2b2712c [formerly 605c8dfe77]
Former-commit-id: fdc4ebb5b5
2013-01-08 16:44:56 -06:00
Ben Steffensmeier
37f8b86337 Issue #1438 do not log grib ingest
Former-commit-id: c0a6c84eca [formerly b7b5f2e22f] [formerly 1c5f61bf33] [formerly 36ce3e2df9 [formerly 1c5f61bf33 [formerly f2c0fb9ec75271d5c277e8c93da3848a455518fb]]]
Former-commit-id: 36ce3e2df9
Former-commit-id: 7d99bb56744c193cb977c56ebe1f2f6513612a2b [formerly 0c675d3deb]
Former-commit-id: cc9922a697
2013-01-08 15:50:47 -06:00
Dustin Johnson
8dc4f1abca Issue #1299 Log if invalid forecast index is requested
Change-Id: If550175be76c99a90acd228dc8f4542fb39ee644

Former-commit-id: 8b813b58f7 [formerly 2e8172899c] [formerly cb9a603da8] [formerly d3f2a7a19e [formerly cb9a603da8 [formerly 30b3c809902e82b40855ddf31f2c6faecf59f861]]]
Former-commit-id: d3f2a7a19e
Former-commit-id: d8658ca841aa7d2ca44f4627ac41e01e73f7c82c [formerly 004bad506d]
Former-commit-id: 8b42d8aa2e
2013-01-08 14:51:53 -06:00
Brad Gonzales
d718fc9152 Issue #1436 Fixed selection icon reset, Fixed area text box display check.
Change-Id: Ib7545ff9e23eadac26daf927ce428b805f3be4b2

Former-commit-id: 6874e17cc2 [formerly 701c572625] [formerly c9c68424f9] [formerly a78c49e2b1 [formerly c9c68424f9 [formerly 4fb8c74153e6da96943cf6ee71b03f5c3ff73176]]]
Former-commit-id: a78c49e2b1
Former-commit-id: 553ebc60db83a2e112000434759c7a3802e8a245 [formerly 5a5644a2c5]
Former-commit-id: 21e8f98ee8
2013-01-08 14:12:22 -06:00
Ben Steffensmeier
f5bf7a99ca Issue #1438 change string null to be converted to null always.
Change-Id: I4dfdc681f339c1f7552aae27113f1cbe6e5584e7

Former-commit-id: e7c7bfc0ce [formerly d5c6061ffc] [formerly 0659a127ff] [formerly 8421469229 [formerly 0659a127ff [formerly 12de9bf8bab68ee225a7b31d02c556ad3605aad6]]]
Former-commit-id: 8421469229
Former-commit-id: f081408de0ecbf94f84671da04ad9b4ca0cf554d [formerly 79474382d2]
Former-commit-id: b911356a64
2013-01-08 12:56:46 -06:00
Dustin Johnson
71e085b940 Issue #1453 Fix the handling of subscription active period dates.
Amend:
  Move tests project over that was missed while moving datadelivery code

Change-Id: I10611f8a4b6c2efe6af1813e5181fadc059e4f9a

Former-commit-id: 3fb35985d0 [formerly 1975cd0442] [formerly 6a90779214] [formerly 2635e05723 [formerly 6a90779214 [formerly 0e1397db6ca1a7a577d20507bc2c4daf823188fe]]]
Former-commit-id: 2635e05723
Former-commit-id: db9b8d2b230d04c2984037f6535517c2201db20b [formerly 492cee4992]
Former-commit-id: 885f315d30
2013-01-08 12:44:29 -06:00
Steve Harris
e29497e347 Merge "Issue #1459 fix interp function when data is shared amongst multiple parameters." into development
Former-commit-id: 6fea2ea422 [formerly 41906e5278] [formerly d9650b113c] [formerly 4c5a92876f [formerly d9650b113c [formerly 217b8d82c7b558a8c78126c3ba37f915a8c9e693]]]
Former-commit-id: 4c5a92876f
Former-commit-id: 8fc7e1d9e95a2e0f82378c8d3b01eb6db6986ffa [formerly 64f6a70c37]
Former-commit-id: 33b21a127c
2013-01-08 10:46:29 -06:00
Ron Anderson
5f11995f9d Merge "Issue #1438 fix problems reading a non existent grid alias file." into development
Former-commit-id: 83d9acb900 [formerly dc156f69c4] [formerly 61700b2f37] [formerly 19fc9e2bbc [formerly 61700b2f37 [formerly 3880bfbd8bf84a9ed4ba93b785b2a45f3af35f81]]]
Former-commit-id: 19fc9e2bbc
Former-commit-id: d81ed4a74678d47e525c1ce217f742e7d4727a6d [formerly 5e9f24b527]
Former-commit-id: 0a585a9498
2013-01-08 10:36:19 -06:00
Ben Steffensmeier
9a084c2371 Issue #1438 fix problems reading a non existent grid alias file.
Former-commit-id: 10bc83190e [formerly 15c7614ffe] [formerly 4ca0f320cc] [formerly ecbbc823f1 [formerly 4ca0f320cc [formerly 77868132755b799810c9a01888fcec06798070fb]]]
Former-commit-id: ecbbc823f1
Former-commit-id: efaab21a099bc78c444632abe08315d205bc9e4e [formerly 777a1d93bb]
Former-commit-id: b9980a0f77
2013-01-08 10:32:50 -06:00
Nate Jensen
a47ff818b9 Merge "Issue #1329 fixed bug in FileLocker" into development
Former-commit-id: aa5eb009e0 [formerly 42b24aa97f] [formerly 27a96cf383] [formerly f77cf10fea [formerly 27a96cf383 [formerly 079e2ac290f6d914b103be4ebec0420c2f9f0a93]]]
Former-commit-id: f77cf10fea
Former-commit-id: b8cdba010ea29e901b536de4b95796dda098c2f3 [formerly f160900fe5]
Former-commit-id: efb750cc67
2013-01-08 10:30:21 -06:00
Bryan Kowal
ebfcb54d88 Issue #1460 - Merge 4.7-GIS_Viewer into AWIPS2_baseline
Former-commit-id: 23c510dd69 [formerly 87d0821429] [formerly 76fe910606] [formerly 03f108f80b [formerly 76fe910606 [formerly 9e0eae1725af06ce834c926a4d70195a075e8152]]]
Former-commit-id: 03f108f80b
Former-commit-id: da032922f2d57ac81e22d50f2e2d5d1d844bfc99 [formerly bbeb6b5101]
Former-commit-id: 7dd7d1cfa7
2013-01-07 18:14:07 -06:00
Richard Peter
e23978d779 Merge "Issue #1456 Changed ArrayList parameter to List." into development
Former-commit-id: 40fb80ac1c [formerly 2eae9d7131] [formerly 42252b2c5a] [formerly 39d6e335ff [formerly 42252b2c5a [formerly f813d20563b711e270f751d2659d414487af06fb]]]
Former-commit-id: 39d6e335ff
Former-commit-id: e3c93295fe4e4e5dc5e4dcbb47b7ff47d4bc9283 [formerly c2044ef63e]
Former-commit-id: 5f02ab4bb6
2013-01-07 17:04:47 -06:00
Richard Peter
9fd8d277f7 Issue #1454: Update registry log4j
Change-Id: If564a1a3d00c6b719603544e1a319928f3fedaa5

Former-commit-id: 9d5bfa7ae7 [formerly 08922e14b7] [formerly 0cac4bd0a86346365109369b65e575c7ca16e2ba [formerly c8f79ee0cc]] [formerly 7b4d04e828 [formerly c8f79ee0cc [formerly 81dd356264723578ab871c63bc47386cfb3d40ce]]]
Former-commit-id: 7b4d04e828
Former-commit-id: f0b94833f7347795c6b6916e2dd588c1447a0145 [formerly b9ae764a04]
Former-commit-id: 84c5aa1d29
2013-01-07 17:03:15 -06:00
Brad Gonzales
4afcf99299 Issue #1456 Changed ArrayList parameter to List.
Change-Id: I47e7a054b774f5f2707f53b1c3692c3ec07ac157

Former-commit-id: d528f95adf [formerly 69fcfd55bb] [formerly 1c6cfee5cc] [formerly 71230cc246 [formerly 1c6cfee5cc [formerly 6ba091caf7aa4de243fbea57ed19ae99ddb39585]]]
Former-commit-id: 71230cc246
Former-commit-id: 0496bb4a4e12ef88a28c234a0b63a1e3743eaee7 [formerly 9bcf7cbd07]
Former-commit-id: d0fae4de6d
2013-01-07 16:55:04 -06:00
Ben Steffensmeier
f268d69ccd Issue #1459 fix interp function when data is shared amongst multiple parameters.
Former-commit-id: 17b4c241ff [formerly 167fe74ee7] [formerly f04c6b7e1e] [formerly c0e9f3429b [formerly f04c6b7e1e [formerly 9c8281cd26029e9b3979fbc8f0ed713b66f092ba]]]
Former-commit-id: c0e9f3429b
Former-commit-id: 16038dd9e7f3dfe82587ac8cc0201440a16a7f15 [formerly 93e6818a2d]
Former-commit-id: 76802aefa9
2013-01-07 16:39:45 -06:00