Roger Ferrel
6e25c11a75
Issue #1492 Made GFE's GhgFontDlg and volume browser's InventoryDlg non-blocking; removed no longer needed "original" classes. No code changes merge conflict?
...
Change-Id: I28676d7b6d016e3f4f61fcc667c2e1d2af9e53d1
Former-commit-id: 413e9beda4
[formerly fbf6bc87c4
] [formerly 5250a0addf
] [formerly 413e9beda4
[formerly fbf6bc87c4
] [formerly 5250a0addf
] [formerly cabdfd569f
[formerly 5250a0addf
[formerly 5444e7653c0cf488eb424a16816beb2e6a9335b1]]]]
Former-commit-id: cabdfd569f
Former-commit-id: 9e9eaa3d4a
[formerly 5187be10ca
] [formerly 4ee08f43125d4ae99c00e0d968468d22822b0fc2 [formerly e8d8dcc795
]]
Former-commit-id: ba6bf8fd510b31739983af51e7ae6b34c91ec512 [formerly 3a9b914186
]
Former-commit-id: fe30158953
2013-01-16 13:07:58 -06:00
Steve Harris
e77b0896ee
Merge branch '13.2.1_delivery' into development
...
Former-commit-id: e87c1739ce
[formerly 79e7b50d94
] [formerly 8c447659ff
] [formerly e87c1739ce
[formerly 79e7b50d94
] [formerly 8c447659ff
] [formerly 483e55bcef
[formerly 8c447659ff
[formerly 723f0efba18c83c46d3b241dae678e81d2ac924d]]]]
Former-commit-id: 483e55bcef
Former-commit-id: bda3371aef
[formerly b8ab464cee
] [formerly 1f1108e1b07236a5416fa8b9d145b56652782043 [formerly 2e34a82690
]]
Former-commit-id: 8b7928ea064b9023438dda6e63c688f3a7d1c069 [formerly 77662c1de0
]
Former-commit-id: f1164c96a7
2013-01-16 12:03:50 -06:00
Bryan Kowal
3fca7d882f
Issue #1469 - getPath will be used in the place of getAbsolutePath so java does not prepend a fictional path to the beginning of the expected path
...
Former-commit-id: d194f3c137
[formerly 55550007cb
] [formerly 2ed28bed93
] [formerly d194f3c137
[formerly 55550007cb
] [formerly 2ed28bed93
] [formerly 8c118e791b
[formerly 2ed28bed93
[formerly 18676a8f73c7ac0eb2ce0ff25cf3c66ae1f72f02]]]]
Former-commit-id: 8c118e791b
Former-commit-id: 00c7284039
[formerly 1eb4e6d41e
] [formerly d8bdc1f2055cc2924e29bd41737da260c406b70c [formerly 0a39b4ddf1
]]
Former-commit-id: ee3b477b1fc070b014bea68023ff497f01ed3763 [formerly e9e16abea2
]
Former-commit-id: 6dbe3e938f
2013-01-15 18:46:46 -06:00
Bryan Kowal
6ec132fb7c
Issue #1414 - adding Satellite to the Data Access Framework
...
- addressed peer review comments
- includes the CAVE generic grid resource and resource data
- the generic grid resource now utilizes the populateData method of IGridData
- the data time methods of the satellite factory will now throw data retrieval exceptions
Change-Id: I763cddc8ba8cac715eb0605594904bd9f9c21db9
Former-commit-id: 77660c9f5f
[formerly a315e4461b
] [formerly 4939e96872
] [formerly 77660c9f5f
[formerly a315e4461b
] [formerly 4939e96872
] [formerly 789359a779
[formerly 4939e96872
[formerly b084e4a721edc9400fc7a8f25c7da539d6dd8480]]]]
Former-commit-id: 789359a779
Former-commit-id: 83209a66b7
[formerly 03ccca567a
] [formerly cc9c31268f1400d39d5c2b01410315020dcc64f3 [formerly 53a280116b
]]
Former-commit-id: 814ce607bdf9b22bf2eee0779984c600ff59725b [formerly e443218bfb
]
Former-commit-id: f99ad00934
2013-01-15 18:08:17 -06:00
Richard Peter
d7bfb06114
Merge "Issue #1489 Harvester directories not created causing harvester to not start" into 13.2.1_delivery
...
Former-commit-id: 853f62e60d
[formerly e8a4939150
] [formerly 09fb2d0919
] [formerly 853f62e60d
[formerly e8a4939150
] [formerly 09fb2d0919
] [formerly 0e684515c6
[formerly 09fb2d0919
[formerly 8388122d8273aca20a9c4292035049957a091a69]]]]
Former-commit-id: 0e684515c6
Former-commit-id: c589e52e22
[formerly cb3f43b17a
] [formerly dfce9cdbec9337e69a2347d574c754aa6bb72aca [formerly 8258395d58
]]
Former-commit-id: b0885f181de22e65e78be230a89fa014fef86e17 [formerly 81bfd386a2
]
Former-commit-id: 90d7ef6fc3
2013-01-15 16:11:35 -06:00
Bryan Kowal
b93b2f41fb
Issue #1469 - updated for compatibility with recent changes to Pypies.
...
Former-commit-id: 147cf7902b
[formerly 90b9cf9804
] [formerly 02c16b6f3d
] [formerly 147cf7902b
[formerly 90b9cf9804
] [formerly 02c16b6f3d
] [formerly d710e987e4
[formerly 02c16b6f3d
[formerly 417ecdcc5b9907b95856571d5d03fa12099eb3f6]]]]
Former-commit-id: d710e987e4
Former-commit-id: a0abbfd761
[formerly 8a7376ed60
] [formerly 3baeb9bb62d5988bfa2a7a03edecc279dd153b9a [formerly 37d1aee965
]]
Former-commit-id: 87daf65ceb0838923be5081f0276e6b2de5d0e2f [formerly 34518b7cf6
]
Former-commit-id: cd4624e79e
2013-01-15 16:09:42 -06:00
Brad Gonzales
a658c27a1c
Issue #1452 Clear current filters when creating a new filter configuration.
...
Change-Id: I7562e05f404b7b3bc746a168d72601520d3a8500
Former-commit-id: 9c295d4f42
[formerly 5fd396acaf
] [formerly 026c98298b
] [formerly 9c295d4f42
[formerly 5fd396acaf
] [formerly 026c98298b
] [formerly e7ecc52e25
[formerly 026c98298b
[formerly c4f47262403a56a0e6fe28bb1b5ac523fb91e43f]]]]
Former-commit-id: e7ecc52e25
Former-commit-id: 927d6df024
[formerly 382a21f3a2
] [formerly e681b7568c05bb90bf8bfa1123327c5e349b5e23 [formerly 253ac8f1d3
]]
Former-commit-id: 0219e8686e5be11bce2d412174c7e7350fea13f6 [formerly 5693e82505
]
Former-commit-id: beed5ad195
2013-01-15 15:50:43 -06:00
Dave Hladky
0b97fcb572
Issue #1475 QPF standalonoe displays appear slow
...
Change-Id: I352de7f76ade5d3d981b3c6206086955c2243f6a
Former-commit-id: 0b8d399f64
[formerly ffd3faa84b
] [formerly 0f7a64798d
] [formerly 0b8d399f64
[formerly ffd3faa84b
] [formerly 0f7a64798d
] [formerly 6822591e1a
[formerly 0f7a64798d
[formerly 6e7c86aba7103c445823ac2a11a2241939e4b6c2]]]]
Former-commit-id: 6822591e1a
Former-commit-id: 81ef046069
[formerly 9d935baf22
] [formerly b34b35f09adc05a6a90fe87bd4081a824d7698fd [formerly 81c9f8e21e
]]
Former-commit-id: 791d3b78dbee615156a9edfbdf757cb5b4c4b750 [formerly 5b9f40661a
]
Former-commit-id: 4fd7346b03
2013-01-15 15:50:27 -06:00
Richard Peter
5181dec9e2
Merge "Issue #1286 Fix bugs found during 1286 testing" into 13.2.1_delivery
...
Former-commit-id: 75f41d14eb
[formerly d30a607764
] [formerly c8d963d541
] [formerly 75f41d14eb
[formerly d30a607764
] [formerly c8d963d541
] [formerly dc6ee0b9e1
[formerly c8d963d541
[formerly e2516f60d0748830d5849f42819e2dcc66b67bb6]]]]
Former-commit-id: dc6ee0b9e1
Former-commit-id: a463891c8e
[formerly fe2c8b320e
] [formerly 313b538a60cf36a05c010c4dcf3f45a5c2b0bd4a [formerly b456405145
]]
Former-commit-id: 1e4e1de1f58f57869008986045830f25583958ba [formerly aef2f39a62
]
Former-commit-id: 84e0f2cf1f
2013-01-15 15:37:42 -06:00
Nate Jensen
0a813170ee
Merge "Issue #1446 improve javadoc" into development
...
Former-commit-id: 391d892387
[formerly 0831a0252d
] [formerly 10f67e664d
] [formerly 391d892387
[formerly 0831a0252d
] [formerly 10f67e664d
] [formerly c78078ee6e
[formerly 10f67e664d
[formerly 186ecd09bb158d77c63be03b556f6b4a648f4191]]]]
Former-commit-id: c78078ee6e
Former-commit-id: 9572d5ff1c
[formerly 34c9aa4a6f
] [formerly 93c12836e30608cd717a02c83ce0e520fca7e1c6 [formerly 7cb08e43b8
]]
Former-commit-id: 316b4ffa55a2399e86656fbaaab88bff2eea9490 [formerly 0e411bce89
]
Former-commit-id: 315a0d1c73
2013-01-15 15:27:44 -06:00
Nate Jensen
1ad8202ec7
Issue #1446 improve javadoc
...
Change-Id: I5cd77c5d4e5e75f3b0a364db610c470d163b9307
Former-commit-id: ea0b3aebed
[formerly 1bd160b878
] [formerly 2450821fe7
] [formerly ea0b3aebed
[formerly 1bd160b878
] [formerly 2450821fe7
] [formerly 8588d94cd7
[formerly 2450821fe7
[formerly 668baa6b031f79d82aff64d98a13cd901ac90222]]]]
Former-commit-id: 8588d94cd7
Former-commit-id: 0c971c4543
[formerly f342a404c6
] [formerly 43b2db9917d10844d8545607870b024c4be661d0 [formerly 3ea6667da1
]]
Former-commit-id: eab18a3ed35fc19e7db514ed9cd77048808493d9 [formerly cd4f1a651b
]
Former-commit-id: e3643ece32
2013-01-15 15:22:46 -06:00
Bryan Kowal
d9c01fe8a0
Issue #1469 - pypies will now read the hdf5 root directory from configuration. Relative paths can now be passed to pypies. Rebased to fix merge conflict.
...
Change-Id: I38873e478729a3644db7ce2813e9bd6c15d9bdf3
Former-commit-id: 1414f0415b
[formerly fba28ea69b
] [formerly e2a12845d3
] [formerly 1414f0415b
[formerly fba28ea69b
] [formerly e2a12845d3
] [formerly 4db9c6c321
[formerly e2a12845d3
[formerly ed2e78738b391bcb9a40ddde7b7a6acf7ccd1b30]]]]
Former-commit-id: 4db9c6c321
Former-commit-id: 49b121ed3a
[formerly 38480e46b1
] [formerly 59073a26adad34d6d9a1d72d03facd04de433ad2 [formerly c1330e8121
]]
Former-commit-id: 64fa164a62368e1ef375932fe20cd65b2d0ba6fb [formerly 290167ac16
]
Former-commit-id: 89cc2bdf57
2013-01-15 14:56:01 -06:00
Lee Venable
717642416f
Merge "Issue #1483 switch dual pol bundles to no longer use bestRes, fix bestRes updates." into development
...
Former-commit-id: 1578950906
[formerly a3c5aded12
] [formerly 32692a6def
] [formerly 1578950906
[formerly a3c5aded12
] [formerly 32692a6def
] [formerly f63da5aba6
[formerly 32692a6def
[formerly 517b6e6652b75801928cbb8f2f6899916e8dd988]]]]
Former-commit-id: f63da5aba6
Former-commit-id: e5e1841b7e
[formerly c4291fcb2a
] [formerly 2d8f8827471d802ee24a1d297aac5aed42839e14 [formerly 5a733e465d
]]
Former-commit-id: c63b057f5dee3a652c87b56e1ae096143f3c4b3f [formerly b8c01b939b
]
Former-commit-id: ed28295ec1
2013-01-15 14:47:49 -06:00
Max Schenkelberg
56d05965a7
Issue #1457 Initial changes for MPE time refactor. Wrote custom resource that handles multiple times and tailored code to use resource instead of old XmrgResource which was not written to support multiple frames
...
Amend: Cleaned up comments and some bugs in code after review
Amend: Rebased changes
Change-Id: I512b9bb30a08b9a1cfc5e8d9b5008ebc4f352c2d
Former-commit-id: 77c2ae6ad1
[formerly e5cd1901a5
] [formerly ff72ce0b0c
] [formerly 77c2ae6ad1
[formerly e5cd1901a5
] [formerly ff72ce0b0c
] [formerly db3e7bab99
[formerly ff72ce0b0c
[formerly ab74da7808aa343983f532ee076820c7e63fdded]]]]
Former-commit-id: db3e7bab99
Former-commit-id: 4e507c57f6
[formerly fac8769336
] [formerly 36ba7490bc83dc4ce324f378bdf66b8020044b22 [formerly c246f56568
]]
Former-commit-id: 8a42c64afd5c2350c96215ef1e4d9f285971a7a1 [formerly 21dae56a1b
]
Former-commit-id: be1fb93c1b
2013-01-15 14:41:19 -06:00
Max Schenkelberg
7f857992b6
Issue #1462 Created new BundleLoader and BundleProductLoader to consolidate code for loading Bundles to the screen asynchronously.
...
Amend: Switched to proper ticket
Change-Id: Iacfc73f574aef64bba43323818ea3484b1f5a9b9
Former-commit-id: f51398595e
[formerly 9aac1d2871
] [formerly 02e7c79de9
] [formerly f51398595e
[formerly 9aac1d2871
] [formerly 02e7c79de9
] [formerly aa88b83859
[formerly 02e7c79de9
[formerly 86aa1a7febbd1b8671e546c2b9eaca10f82860a4]]]]
Former-commit-id: aa88b83859
Former-commit-id: cea378c445
[formerly 410abb1144
] [formerly 451ec6f6d7261a1c251d7e39253fc41e3af7c367 [formerly c6b6823228
]]
Former-commit-id: 12984637b106529c3322a63eb74880567de70ad5 [formerly f35d30e675
]
Former-commit-id: 5d6421259b
2013-01-15 14:13:36 -06:00
Nate Jensen
c1d96a5c67
Issue #1446 Initial python within Jep implementation of data access framework
...
Change-Id: I7b6ddb25f0ec68419aab7e40f15f94cd16e155b8
Former-commit-id: 744f536415
[formerly e5e7107a56
] [formerly e5237fceac
] [formerly 744f536415
[formerly e5e7107a56
] [formerly e5237fceac
] [formerly 12e0a100c4
[formerly e5237fceac
[formerly 1c5339c02a8570e12f92559a3159006efdf0df77]]]]
Former-commit-id: 12e0a100c4
Former-commit-id: 65e91312b6
[formerly f726a26b54
] [formerly 7bc5f3faca240fbf62ffec334f821eb98bc580ed [formerly aaa442212a
]]
Former-commit-id: c66cd235437b4633721e60a0a8ea567a4372d697 [formerly d16264c05b
]
Former-commit-id: fcb34cb00f
2013-01-15 13:48:04 -06:00
Richard Peter
4e5d991481
Merge "Issue #1452 Clear current filters when creating a new filter configuration." into development
...
Former-commit-id: cd3fcb5561
[formerly e1ce9b63f1
] [formerly 02f597fdb2
] [formerly cd3fcb5561
[formerly e1ce9b63f1
] [formerly 02f597fdb2
] [formerly b94c90fd51
[formerly 02f597fdb2
[formerly 0fd071aa5ac96a6548ac350f55820837cf20a992]]]]
Former-commit-id: b94c90fd51
Former-commit-id: ea1a93d1b9
[formerly 99513feec9
] [formerly 5710507c6a21951c23fd8e681b010a9da4b49ce8 [formerly 4966d706ae
]]
Former-commit-id: 66f440fd69a1a523ad4483c4ff01fe7cc238d5b8 [formerly ab644f9ff0
]
Former-commit-id: 0c8c696176
2013-01-15 13:40:49 -06:00
Richard Peter
bb4aa5ca8a
Merge "Issue #1475 QPF standalonoe displays appear slow" into development
...
Former-commit-id: d2fbb1af03
[formerly ed6d929dcd
] [formerly e7305ca187
] [formerly d2fbb1af03
[formerly ed6d929dcd
] [formerly e7305ca187
] [formerly 11e8dae113
[formerly e7305ca187
[formerly 1d1a155a0276dcf02ccc9d66937d0a6d37d51722]]]]
Former-commit-id: 11e8dae113
Former-commit-id: 00a4f2f3b7
[formerly cf1d3faab2
] [formerly a4769661683a42397b8db11e48020d84acc28608 [formerly b3d5faebf3
]]
Former-commit-id: e986c970ff06ddf711c07be949af4111e4619b1a [formerly e8cfb4ee74
]
Former-commit-id: 5541525526
2013-01-15 13:40:13 -06:00
Dave Hladky
43b0a2d575
Issue #1489 Harvester directories not created causing harvester to not start
...
Change-Id: Id5caa14ebc33451f95e5d1e9d685c4094091ff63
Former-commit-id: e5b4934da1
[formerly 34577b50dd
] [formerly 9b75eaf869
] [formerly e5b4934da1
[formerly 34577b50dd
] [formerly 9b75eaf869
] [formerly b6bf73134e
[formerly 9b75eaf869
[formerly 08b944fa708ba12ac6df63b64501ff20f4738063]]]]
Former-commit-id: b6bf73134e
Former-commit-id: e45aff44f4
[formerly fa9dc500a3
] [formerly 3db6fe5b5d30defe833550d4242d81c1a27c008e [formerly ccf832dd38
]]
Former-commit-id: 4fb19b27ae798879f24fe97c6f8cba41e4fd5645 [formerly d1c940cd8e
]
Former-commit-id: 50d1017f46
2013-01-15 12:41:15 -06:00
Dustin Johnson
23e70d529a
Issue #1286 Fix bugs found during 1286 testing
...
Amend:
Add time domain code.
Change-Id: Ib62ea23571a7e80877f8090064a8638e111fd2d2
Former-commit-id: 50fa22f710
[formerly 99f8d40bed
] [formerly 3d74a68e94
] [formerly 50fa22f710
[formerly 99f8d40bed
] [formerly 3d74a68e94
] [formerly 2cf52d976b
[formerly 3d74a68e94
[formerly 9b79cfc11541c737087fb613c686d50cf79e0a7b]]]]
Former-commit-id: 2cf52d976b
Former-commit-id: b18fc5ff5e
[formerly 94e95f3e07
] [formerly d2caf5c394290add805dceb28270a72f9b600765 [formerly aa7acedf0a
]]
Former-commit-id: 21ec2413c9d2a86c99721c6504722141f9046ddb [formerly 5cd31fc0b7
]
Former-commit-id: 1070de3f2d
2013-01-15 10:18:14 -06:00
Steve Harris
82b5097d74
Issue #1408 - Fix syntax errors in server config
...
Former-commit-id: 73c5d94310
[formerly 9a3be4460e
] [formerly aee6a65e4c
] [formerly 73c5d94310
[formerly 9a3be4460e
] [formerly aee6a65e4c
] [formerly a5eac8ec3c
[formerly aee6a65e4c
[formerly 29e1fc44a04dff56747b60d904e49d87cebf4f85]]]]
Former-commit-id: a5eac8ec3c
Former-commit-id: eedb2903b1
[formerly e202452ace
] [formerly b03470754f36ce50d19e7ef9072478e1b49ef2dd [formerly 31f190865e
]]
Former-commit-id: 34f68cca639238d5ffbaad2490418fbb6ef80dee [formerly 72f3894768
]
Former-commit-id: 846ac28155
2013-01-15 09:47:25 -06:00
Richard Peter
0a55bcfd67
Merge branch 'ss_builds' (13.2.1-1) into development
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 6e42fa32d3
[formerly a966546e31
] [formerly 3fb7d96ec1
] [formerly 6e42fa32d3
[formerly a966546e31
] [formerly 3fb7d96ec1
] [formerly 1dbb34523b
[formerly 3fb7d96ec1
[formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]]]
Former-commit-id: 1dbb34523b
Former-commit-id: d880361e06
[formerly 79ef100838
] [formerly 85a5d2a8fdf64c0ba9efe9815c5ef9cb8f27eb62 [formerly 345dfd2ca9
]]
Former-commit-id: ef42f50f6a062518b4a0d8effc537eaf4c7292a1 [formerly cd2014bf8d
]
Former-commit-id: e838f2db25
2013-01-14 18:07:17 -06:00
Brad Gonzales
6ab720af1f
Issue #1452 Clear current filters when creating a new filter configuration.
...
Change-Id: I7562e05f404b7b3bc746a168d72601520d3a8500
Former-commit-id: 323f1f44c4
[formerly 574ed7c971
] [formerly 03c7656f55
] [formerly 323f1f44c4
[formerly 574ed7c971
] [formerly 03c7656f55
] [formerly 771debed33
[formerly 03c7656f55
[formerly dc3f958011b53ba07ea21648ca1c634bd7b677b7]]]]
Former-commit-id: 771debed33
Former-commit-id: 23f6270d4c
[formerly 35a85c2c91
] [formerly 3f687442e0ee4193ff1fb6357696a0241823c642 [formerly 10aa12c141
]]
Former-commit-id: a71e9a9997bda18b3f143094cc84f84e8539103a [formerly 50b9cfbd0f
]
Former-commit-id: 5904eff82d
2013-01-14 18:06:29 -06:00
Richard Peter
41573e6a66
Merge "Issue #1408 : Merge branch 'ss_builds' (13.1.2-8) into development" into development
...
Former-commit-id: 4c82ddaa12
[formerly d2cc93281a
] [formerly 59368e93e1
] [formerly 4c82ddaa12
[formerly d2cc93281a
] [formerly 59368e93e1
] [formerly 4176d078a7
[formerly 59368e93e1
[formerly 931d3e1bba7c747737818f5a2a0c8a8ad9a32c47]]]]
Former-commit-id: 4176d078a7
Former-commit-id: dd346fa040
[formerly ea7d2eaff1
] [formerly f0175e39c5b471bab4e4eaa25e855a6631e81662 [formerly 2049e40d87
]]
Former-commit-id: bdf12ba78e3f28331c93eea472f33745bc6ddaa1 [formerly 57e68e7872
]
Former-commit-id: ff672cac47
2013-01-14 17:49:29 -06:00
Lee Venable
6025fa2b5f
Merge "Issue #1480 guarantee that framesInfo returned from descriptor is always valid." into development
...
Former-commit-id: 66aab3680d
[formerly c3dec53498
] [formerly 7009876544
] [formerly 66aab3680d
[formerly c3dec53498
] [formerly 7009876544
] [formerly a3a7dc44c9
[formerly 7009876544
[formerly 2069b8265416fae4c8fbeb37b4686b85428eca7f]]]]
Former-commit-id: a3a7dc44c9
Former-commit-id: 9d53072b41
[formerly baa5496a72
] [formerly fdd917cd63082600218ba6b454499b49789ae013 [formerly 4e2b009db0
]]
Former-commit-id: dcd813e94b8797a6e59a43eb7e56c6cc4f0f14b9 [formerly 4c2353f110
]
Former-commit-id: 6101a97ad0
2013-01-14 17:47:59 -06:00
Ben Steffensmeier
405ec460f7
Issue #1483 switch dual pol bundles to no longer use bestRes, fix bestRes updates.
...
Former-commit-id: 1926965b6b
[formerly da79be73a2
] [formerly f49e77f7df
] [formerly 1926965b6b
[formerly da79be73a2
] [formerly f49e77f7df
] [formerly 2e10a8408b
[formerly f49e77f7df
[formerly c0888b1ff6de67da8b4bb7a234bc5dbecafa9009]]]]
Former-commit-id: 2e10a8408b
Former-commit-id: 2ebe93dc12
[formerly 3d63fa24a1
] [formerly 2adb2b2db42f9a0a161c689d6a3b7ec66791bb64 [formerly 0a0d230091
]]
Former-commit-id: b77bd47a9b61a62d7e87a9111d90036d52bba942 [formerly fcc71cc31d
]
Former-commit-id: 88ac5805b6
2013-01-14 17:44:46 -06:00
Steve Harris
e5f32a2bbe
13.2.1-1 baseline
...
Former-commit-id: 8dd688c878
[formerly 5dfe4d10f1
] [formerly e62172c8c7
] [formerly 8dd688c878
[formerly 5dfe4d10f1
] [formerly e62172c8c7
] [formerly 81849e3cbb
[formerly e62172c8c7
[formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]]
Former-commit-id: 81849e3cbb
Former-commit-id: 3d35fd52d5
[formerly e34695538d
] [formerly c835df6c612355b23abcc04a384d5b398d1c5ec6 [formerly 8713dfc5ca
]]
Former-commit-id: d5a28dcde502767d0f84d7301207580849e0a584 [formerly ebff2a6275
]
Former-commit-id: b4556ea28f
2013-01-14 18:42:21 -05:00
Richard Peter
031bae3bfd
Issue #1408 : Merge branch 'ss_builds' (13.1.2-8) into development
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/dbscandb.c
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/proto_gemlib.h
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/uscore.h
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/EnsembleSelectComposite.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcEnsembleResourceData.java
Former-commit-id: 4e1f66abb3
[formerly ae3ea75cbf
] [formerly 1318f53902
] [formerly 4e1f66abb3
[formerly ae3ea75cbf
] [formerly 1318f53902
] [formerly b8e42dabc0
[formerly 1318f53902
[formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]]]
Former-commit-id: b8e42dabc0
Former-commit-id: 9da3b7e2dd
[formerly fa6247baf7
] [formerly bb2a6cb1f185f4b5c4f896fbc2ccaf6004754a84 [formerly aa9e16b038
]]
Former-commit-id: 353348b43765265bcb9885b4db6864c6e23d0b07 [formerly 096134d917
]
Former-commit-id: ef2dc06b69
2013-01-14 17:38:38 -06:00
Richard Peter
252cdf4ed2
Merge "Issue #1477 Permissions broken for ingestDAT SQL querries." into development
...
Former-commit-id: d7beb14c67
[formerly a8495324f7
] [formerly de7d7b07ef
] [formerly d7beb14c67
[formerly a8495324f7
] [formerly de7d7b07ef
] [formerly 9ef997e3e8
[formerly de7d7b07ef
[formerly 83ee4be25f2ad1e0a2f30f2695a2a65200abd787]]]]
Former-commit-id: 9ef997e3e8
Former-commit-id: 809c981306
[formerly 997ab69bf0
] [formerly acf0de98c326adcb9c362eeee1f6403fbb971811 [formerly 94eea3065b
]]
Former-commit-id: b03f2f7ac9211a133637c5710d1b71c02e3b6c48 [formerly bdc637110a
]
Former-commit-id: c7f02b18c5
2013-01-14 17:34:31 -06:00
Richard Peter
cccc6f7918
Merge "Issue #1482 ignore malformed gribModel files" into development
...
Former-commit-id: 85519760d6
[formerly 5ec69e843e
] [formerly 89b08fdd2f
] [formerly 85519760d6
[formerly 5ec69e843e
] [formerly 89b08fdd2f
] [formerly 8192515b06
[formerly 89b08fdd2f
[formerly fd8bd261b089b317e4ce66ca0e0aa6d5861a1b09]]]]
Former-commit-id: 8192515b06
Former-commit-id: c056fd25cb
[formerly 9154383e5a
] [formerly e1968aa07abf36dd7677eb698b3949b4d6ce48c3 [formerly 0b57b16cda
]]
Former-commit-id: c079d32f41e54072fc4ab430c0fe1b6e348e1723 [formerly a1517b8daa
]
Former-commit-id: ad6bd4ace8
2013-01-14 17:34:17 -06:00
Richard Peter
4a40ce8ff3
Merge "Issue #1437 moved changes for ticket 1437 to the AWIPS2_baseline repository." into development
...
Former-commit-id: 99414fa1f0
[formerly 461a503837
] [formerly 32d4bc3d9f
] [formerly 99414fa1f0
[formerly 461a503837
] [formerly 32d4bc3d9f
] [formerly 69c6cfd196
[formerly 32d4bc3d9f
[formerly c8cf77295c7f53dbd2821271298391ba136e034c]]]]
Former-commit-id: 69c6cfd196
Former-commit-id: 715d5bd5f2
[formerly ab38a1f89b
] [formerly 7eb1dd62e445e03b2b2d4d9248f1dfaad042460e [formerly a634690867
]]
Former-commit-id: 50b664ee5697ea7be4c3ca78699ddcf60f9947eb [formerly 2f507e1245
]
Former-commit-id: 9cf234df1e
2013-01-14 17:33:22 -06:00
Richard Peter
97c1ff58a1
Issue #1408 : Merge branch 'ss_builds' (13.1.2-6) into development
...
Conflicts:
cave/com.raytheon.uf.viz.common.core.feature/feature.xml
cave/com.raytheon.uf.viz.core/res/spring/viz.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/auth/UserController.java
cave/com.raytheon.uf.viz.cots.feature/feature.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/OrLevelNode.java
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/TimeRangeLevelNode.java
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogMonitor.java
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/actions/FogMonitorAction.java
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/SafeSeasMonitor.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/actions/SafeSeasAction.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSZoneTableDlg.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/SnowMonitor.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/actions/SnowAction.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowZoneTableDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java
cave/com.raytheon.uf.viz.plugin.nwsauth/src/com/raytheon/uf/viz/plugin/nwsauth/NwsUserManager.java
cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/StatsControlDlg.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourSupport.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgMonitorDlg.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataDefinition.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/ImportLevelNode.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/CoverageUtils.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/HydroDisplayManager.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/AwipsCalendar.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/widgets/duallist/DualList.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/widgets/duallist/DualListConfig.java
cave/ohd.hseb.common/externaljars/jdom.jar
cots/org.geotools/.classpath
cots/org.geotools/META-INF/MANIFEST.MF
cots/org.geotools/build.properties
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/edex/customAssembly.xml
edexOsgi/build.edex/esb/bin/setup.env
edexOsgi/build.edex/esb/bin/wrapper.conf
edexOsgi/build.edex/esb/conf/log4j-registry.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/build.edex/esb/conf/spring/cron.properties
edexOsgi/build.edex/esb/conf/spring/edex.xml
edexOsgi/build.edex/esb/etc/registry.sh
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
edexOsgi/com.raytheon.edex.plugin.grib/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/notify/GribNotifyMessage.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/notify/GribNotifyQueue.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/topo/StaticDataGenerator.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribParamInfoLookup.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GridModel.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/parameter/alias/grib.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/grid104.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/GribModels_FNMO-58.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_ECMWF-98.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_FSL-59.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NOAA-161.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NWSTG-8.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RFC-9.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RSMC-54.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_UKMET-74.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/ecmwf.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpcGuideNDFD.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpc_qpf218.xml
edexOsgi/com.raytheon.edex.plugin.satellite/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/DataFactoryRegistry.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/grid/IGridData.java
edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/mapping/DatasetIdMapper.java
edexOsgi/com.raytheon.uf.common.dataplugin.level/src/com/raytheon/uf/common/dataplugin/level/mapping/LevelMapper.java
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/subgrid/SubGrid.java
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/FileLocker.java
edexOsgi/com.raytheon.uf.common.parameter/src/com/raytheon/uf/common/parameter/lookup/ParameterLookup.java
edexOsgi/com.raytheon.uf.common.parameter/src/com/raytheon/uf/common/parameter/mapping/ParameterMapper.java
edexOsgi/com.raytheon.uf.common.parameter/utility/common_static/base/parameter/definition/parameters.xml
edexOsgi/com.raytheon.uf.common.plugin.nwsauth/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/xml/RoleXML.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.common.util/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/ConvertUtil.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/mapping/AliasNamespace.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/mapping/Mapper.java
edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/RemoteServerRequestRouter.java
edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
edexOsgi/com.raytheon.uf.edex.event/src/com/raytheon/uf/edex/event/EventBus.java
edexOsgi/com.raytheon.uf.edex.gridcoverage/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.gridcoverage/res/spring/gridcoverage-common.xml
edexOsgi/com.raytheon.uf.edex.gridcoverage/src/com/raytheon/uf/edex/gridcoverage/GetGridCoverageHandler.java
edexOsgi/com.raytheon.uf.edex.ohd/resources/com.raytheon.uf.edex.ohd.properties
edexOsgi/com.raytheon.uf.edex.plugin.grid/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridInfoCache.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/res/spring/nwsauth-request.xml
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/handler/GraphDataHandler.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
pythonPackages/pypies/pypies/impl/H5pyDataStore.py
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Change-Id: I80504ec890827bb512be138f319380d04bdfc402
Former-commit-id: 9cad9f0c54
[formerly 1a1a69d38c
] [formerly 970216e4c9
] [formerly 9cad9f0c54
[formerly 1a1a69d38c
] [formerly 970216e4c9
] [formerly 19d923f387
[formerly 970216e4c9
[formerly ad841de833a274ad0d5b48b63dbd7dbefb728117]]]]
Former-commit-id: 19d923f387
Former-commit-id: 7af4fc10a8
[formerly f1262388ce
] [formerly 8835cc0deb6ecb25ed3f4f23af4a1a62f0414be7 [formerly 8ccc791566
]]
Former-commit-id: 1fd01bf080c7430697622a86c36545061e29af0c [formerly 2575e4e4ea
]
Former-commit-id: e59ea72456
2013-01-14 16:53:05 -06:00
Dave Hladky
a4f8c6191e
Issue #1475 QPF standalonoe displays appear slow
...
Change-Id: I352de7f76ade5d3d981b3c6206086955c2243f6a
Former-commit-id: a8b5ee21f6
[formerly 199d88d6a8
] [formerly 8ac74e6b0d
] [formerly a8b5ee21f6
[formerly 199d88d6a8
] [formerly 8ac74e6b0d
] [formerly 75f62b0856
[formerly 8ac74e6b0d
[formerly 2f6bf58b35e6ff8317281c3e62d1c1a61eea14f0]]]]
Former-commit-id: 75f62b0856
Former-commit-id: 8abd5b779a
[formerly 360d3bfe23
] [formerly 5680236721f68eccd4069a48b6526291dc525a33 [formerly be17e02b4a
]]
Former-commit-id: c454cc12385ce08c75c9ec71ae7cbd6c961284d8 [formerly 2348165eda
]
Former-commit-id: af0f6fefba
2013-01-14 15:50:59 -06:00
Ben Steffensmeier
2d845671d7
Issue #1482 ignore malformed gribModel files
...
Former-commit-id: beda2be0cb
[formerly fadf4d58cf
] [formerly 685c09de47
] [formerly beda2be0cb
[formerly fadf4d58cf
] [formerly 685c09de47
] [formerly 9cfa09e507
[formerly 685c09de47
[formerly 272da22e4ce82215aa4b00ce7624811f81327889]]]]
Former-commit-id: 9cfa09e507
Former-commit-id: b2029cc48a
[formerly 80e307c96e
] [formerly 68d3db82e2a055144685ccadce3c90ec541556fb [formerly 8fdfc14c29
]]
Former-commit-id: f3128381541f4e049435ad97f2894e64711267b2 [formerly cc70fe7a41
]
Former-commit-id: e65ba73968
2013-01-14 15:10:56 -06:00
Brad Gonzales
c40e21ef4e
Issue #1437 moved changes for ticket 1437 to the AWIPS2_baseline repository.
...
Change-Id: I49b715f4b9f998e933948d3803194aa41deec979
Former-commit-id: 7391e3c0fe
[formerly 1644eee264
] [formerly 5bbe5d5dbf
] [formerly 7391e3c0fe
[formerly 1644eee264
] [formerly 5bbe5d5dbf
] [formerly 72cb336592
[formerly 5bbe5d5dbf
[formerly 9341aa5fe927e38db949be280a323300cd9fc62d]]]]
Former-commit-id: 72cb336592
Former-commit-id: eacfe73d3f
[formerly bd8eaa6dc8
] [formerly bbcec7aca93cd7df0525463803027bc994288c8e [formerly 881cc10e84
]]
Former-commit-id: 94049ee66283e52cd6e49a6c792aab7027e8b1eb [formerly 063551fb18
]
Former-commit-id: 7be1cf3631
2013-01-14 14:47:51 -06:00
Ben Steffensmeier
0c5c4cb9a9
Issue #1480 guarantee that framesInfo returned from descriptor is always valid.
...
Former-commit-id: 4547887fe6
[formerly e00348a124
] [formerly cf8a9e3f64
] [formerly 4547887fe6
[formerly e00348a124
] [formerly cf8a9e3f64
] [formerly ac9ba67919
[formerly cf8a9e3f64
[formerly c2b715458167c4438d2c2c35b3b0cb54c2a9cc9c]]]]
Former-commit-id: ac9ba67919
Former-commit-id: dea702c873
[formerly c1ae999c81
] [formerly c92b1fa2bb66c18a0319bba6df102f7c8450428d [formerly 147a379a81
]]
Former-commit-id: 73a388037366997d5eca653a47b9832fd79df51c [formerly 6b95c98e8e
]
Former-commit-id: 08311ccdf5
2013-01-14 14:30:17 -06:00
Richard Peter
4d9700d5c0
Merge "Issue #1464 fix saving of spatial subsets." into development
...
Former-commit-id: 16ccbec7fa
[formerly fe28e371a6
] [formerly 65715d4154
] [formerly 16ccbec7fa
[formerly fe28e371a6
] [formerly 65715d4154
] [formerly e180a2ff86
[formerly 65715d4154
[formerly 7a5c93c668bb409857ff0d50a9506c67cae7a081]]]]
Former-commit-id: e180a2ff86
Former-commit-id: 8c0a79611e
[formerly 62d3bd6837
] [formerly bb8dc777c2dc2e01f0556a7a8c7253bf8db95622 [formerly 712fb1cb05
]]
Former-commit-id: be0a6da2438c909117f34d5121582156ee98bf74 [formerly f298a42853
]
Former-commit-id: e2207bce78
2013-01-14 11:56:33 -06:00
Richard Peter
bcda9dfe27
Merge "Issue #1473 : Fix Alarm Alert NPE" into development
...
Former-commit-id: b731360a84
[formerly 621a4cd147
] [formerly 0f705ac355
] [formerly b731360a84
[formerly 621a4cd147
] [formerly 0f705ac355
] [formerly e176fcbf06
[formerly 0f705ac355
[formerly edaf980163ff2f3770cb125b9a837a23ca1b16b2]]]]
Former-commit-id: e176fcbf06
Former-commit-id: 4b57dccb57
[formerly 521e7cf5af
] [formerly 668863fe0d8c1e551660ffd2408217fac215e66b [formerly 157e75f7aa
]]
Former-commit-id: 37d54cbca25d1b22fbd99ed787701ede5ecef694 [formerly d446c490ba
]
Former-commit-id: 6825617baf
2013-01-14 11:55:35 -06:00
Dave Hladky
073f3c8bcf
Issue #1477 Permissions broken for ingestDAT SQL querries.
...
Change-Id: If39e30852e98e85f9309df9e0d03ce0c13c8f94b
Former-commit-id: e3ec930c36
[formerly 65cfb39ba5
] [formerly 30733d3b25
] [formerly e3ec930c36
[formerly 65cfb39ba5
] [formerly 30733d3b25
] [formerly c9160ac945
[formerly 30733d3b25
[formerly 7226d6c64aa5e02c0bfebe530cc2ce578fba787e]]]]
Former-commit-id: c9160ac945
Former-commit-id: bd45e9af0f
[formerly e746688671
] [formerly ecd233941bfc185849d394ea786bc19f15301274 [formerly c5f71be70a
]]
Former-commit-id: 969e08441cecb98cce422486ce46b9039e08656b [formerly 936d0f143d
]
Former-commit-id: 64c293c460
2013-01-14 11:38:45 -06:00
Ben Steffensmeier
1e3deb8b95
Issue #1464 fix saving of spatial subsets.
...
Former-commit-id: e787fdcaf9
[formerly 0933461f40
] [formerly bc5233748a
] [formerly e787fdcaf9
[formerly 0933461f40
] [formerly bc5233748a
] [formerly c8ef480815
[formerly bc5233748a
[formerly 185311ebfda70bf29adb3898682f37ea55bca467]]]]
Former-commit-id: c8ef480815
Former-commit-id: 19104e6cbf
[formerly 053b673790
] [formerly c53d9b72c0b2f445296e31570c1b1f5aa26bb092 [formerly 4fd3d47385
]]
Former-commit-id: d3a8d70bd817c9a98b61b458fee623eff2adc3f6 [formerly 244de069da
]
Former-commit-id: 1ffcc3ada2
2013-01-14 10:49:14 -06:00
Richard Peter
d52760585c
Issue #1473 : Fix Alarm Alert NPE
...
Change-Id: If9208dbed2b4b25c2dbedd4d7058b347028d9fff
Former-commit-id: f1dc664a00
[formerly 1d61d65a1e
] [formerly a4f3a2a174
] [formerly f1dc664a00
[formerly 1d61d65a1e
] [formerly a4f3a2a174
] [formerly e71db46db9
[formerly a4f3a2a174
[formerly ed157e199cb95e5db44095b638332bb9563548d5]]]]
Former-commit-id: e71db46db9
Former-commit-id: c9dd98496b
[formerly c68dcf4554
] [formerly 20466293ab658f7939eaea6be47b45f720037a67 [formerly 8ea3bb4d17
]]
Former-commit-id: d855f4ef5ec0d3316d0d953a526e3365257185a4 [formerly 58d09ab54b
]
Former-commit-id: bd03eaff5f
2013-01-14 09:59:28 -06:00
Richard Peter
234e4844c7
Merge "Issue #1464 fix spatial subset tab and modify area comp so it attempts to initialize to a valid state." into development
...
Former-commit-id: 7e14eb1840
[formerly 854bd1d4e0
] [formerly d2a1388b0e
] [formerly 7e14eb1840
[formerly 854bd1d4e0
] [formerly d2a1388b0e
] [formerly 061fa21537
[formerly d2a1388b0e
[formerly 888b839152d86c536b249e795666c596a213da86]]]]
Former-commit-id: 061fa21537
Former-commit-id: b933bd56c7
[formerly fdf83d8623
] [formerly 4731e8fe09be84df4c8258189e64a2405c94b0a5 [formerly 6176588496
]]
Former-commit-id: 005f315c4545cbf3012b1cd58c82bc18ba4c1449 [formerly a82f86b26b
]
Former-commit-id: f0dcd53a2c
2013-01-11 16:32:03 -06:00
Ben Steffensmeier
b58728e366
Issue #1464 fix spatial subset tab and modify area comp so it attempts to initialize to a valid state.
...
Former-commit-id: d92f2de0c3
[formerly 83cf6ec05c
] [formerly 5c5b2e3c20
] [formerly d92f2de0c3
[formerly 83cf6ec05c
] [formerly 5c5b2e3c20
] [formerly 52f55e6d3a
[formerly 5c5b2e3c20
[formerly acb73f44d4cbea7f36419b1cb44bfff47e87c474]]]]
Former-commit-id: 52f55e6d3a
Former-commit-id: b9baedab39
[formerly 0a5da321d6
] [formerly 13be1753e7eb83458858e4291537dbb830a7ef05 [formerly c617b3cc70
]]
Former-commit-id: a97a34f8dca999162c33a2d1d7f77afd6a4b848f [formerly 79d9115a7a
]
Former-commit-id: 1d91b721d1
2013-01-11 16:26:14 -06:00
Steve Harris
32c48861de
13.1.2-8 baseline
...
Former-commit-id: 5aaacf4eec
[formerly b864fdc303
] [formerly e6217a17de
] [formerly 5aaacf4eec
[formerly b864fdc303
] [formerly e6217a17de
] [formerly 06b8eb8db0
[formerly e6217a17de
[formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]]]
Former-commit-id: 06b8eb8db0
Former-commit-id: 13be9f8987
[formerly 7d0109a349
] [formerly d0dddac1b9c0f73936bff6a2a8424513b3f8a42d [formerly 3caf592e83
]]
Former-commit-id: 93a11a781554c0d3f113b98ce41624b35a753e8d [formerly 066c14dcd2
]
Former-commit-id: 92f1e9416c
2013-01-11 16:19:07 -05:00
Steve Harris
005d9ccae2
13.1.2-7 baseline
...
Former-commit-id: 0b15dff12b
[formerly a8d90da9c0
] [formerly 4f86b07eb0
] [formerly 0b15dff12b
[formerly a8d90da9c0
] [formerly 4f86b07eb0
] [formerly 42189b5f88
[formerly 4f86b07eb0
[formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]]]
Former-commit-id: 42189b5f88
Former-commit-id: 4c8e604619
[formerly f1256f2a9e
] [formerly 14e868b80bdcdb7270336e9346e3a2f321283073 [formerly b7f1dbe72b
]]
Former-commit-id: bc0b5a7bf290d46a49a6251bcf649c05a7b9d563 [formerly 775a338b90
]
Former-commit-id: 1ef10eaf2c
2013-01-11 16:12:09 -05:00
Mike Duff
ac03c3993c
Issue #1420 - Additional changes and cleanup
...
Issue #1420 - remove commented out code, move method
Issue #1420 - fix for max latency
Change-Id: I8a983812e4fab7477659d7f175eaa005bb92f064
Former-commit-id: 0eb256fc41
[formerly 329a010b07
] [formerly 279729e88e
] [formerly 0eb256fc41
[formerly 329a010b07
] [formerly 279729e88e
] [formerly 8411a46e3e
[formerly 279729e88e
[formerly d69e77e9b902d164a5716e432f62bd99e1b784dd]]]]
Former-commit-id: 8411a46e3e
Former-commit-id: 135fd5c13d
[formerly d3ed6f6148
] [formerly 8b9f15d6e0da73076d2f6aec446ddc93878baabc [formerly 950c71c164
]]
Former-commit-id: 0e71292ea44022ed0f31fa4514b8529d747d49a7 [formerly 772154de38
]
Former-commit-id: 66dc038d02
2013-01-11 14:38:34 -06:00
Richard Peter
33bbd393bd
Merge "Issue #1412 Move useradmin plugins out of datadelivery specific feature" into development
...
Former-commit-id: 0c51e2e3aa
[formerly 71d8907b6e
] [formerly 8df96c2a14
] [formerly 0c51e2e3aa
[formerly 71d8907b6e
] [formerly 8df96c2a14
] [formerly 2cb7e1fe2c
[formerly 8df96c2a14
[formerly f65462361c68b9757493f673463c731d0ded9dba]]]]
Former-commit-id: 2cb7e1fe2c
Former-commit-id: cf8483486b
[formerly 74092ae046
] [formerly bae6162eee72ec419f36031f9ab9e5c6edea709d [formerly 90ec121020
]]
Former-commit-id: 85903a4d7fd36b124d852701aa63c2f9da2782b5 [formerly da60306633
]
Former-commit-id: d72901c86c
2013-01-11 12:53:37 -06:00
Dustin Johnson
80af42fd9e
Issue #1412 Move useradmin plugins out of datadelivery specific feature
...
Change-Id: Ide1f64a373d2d65b02fb92afd8e8b484cc620451
Former-commit-id: 32047140e1
[formerly 08911772bf
] [formerly 7d10c7fac5
] [formerly 32047140e1
[formerly 08911772bf
] [formerly 7d10c7fac5
] [formerly f44a2f6ea9
[formerly 7d10c7fac5
[formerly b4908a75e84a6df2ed97e517ac096a7d6693ba2e]]]]
Former-commit-id: f44a2f6ea9
Former-commit-id: bce1b88d26
[formerly 5e4a1b7bd9
] [formerly 1f7651d3448a20469f46b569fcc7d279b6bb1842 [formerly bd8dbc39e7
]]
Former-commit-id: f255756970b2d5c0475ee469843208550ee7f07c [formerly 69c42d3e72
]
Former-commit-id: b462fe0286
2013-01-11 12:39:00 -06:00
Richard Peter
038b214887
Merge "Issue #1453 Fix handling of active period across year boundary" into development
...
Former-commit-id: dc6c7afd42
[formerly 58242a600c
] [formerly 32e5d79e7a
] [formerly dc6c7afd42
[formerly 58242a600c
] [formerly 32e5d79e7a
] [formerly a2c3db2ee7
[formerly 32e5d79e7a
[formerly 5b08568c4f07da6d5916025e076260b0f469a68c]]]]
Former-commit-id: a2c3db2ee7
Former-commit-id: dd12b3fe0f
[formerly cf815a4c72
] [formerly 0dc63b9bd4f59e8fed895f177efe7f6278747845 [formerly d3df89181f
]]
Former-commit-id: 505df6e18a00aa3547de015d6cffa6c770479c9f [formerly a9f01d5846
]
Former-commit-id: 87b4521a69
2013-01-11 12:37:05 -06:00
Richard Peter
0de34fe804
Merge "Issue #1346 - added addtional information to the data browser dataset details dialog" into development
...
Former-commit-id: 7f595074ae
[formerly c309d2dc1e
] [formerly a595356025
] [formerly 7f595074ae
[formerly c309d2dc1e
] [formerly a595356025
] [formerly f9e39660d4
[formerly a595356025
[formerly 410b7e917c48645ef1337b531e18bdb4cbe7fc4f]]]]
Former-commit-id: f9e39660d4
Former-commit-id: b0050959af
[formerly ff1dc7e236
] [formerly 1c18c0a235839ef85ff98f2d1031b2307daefd8d [formerly b9e409357d
]]
Former-commit-id: f5590213954b4c72b51639d919b1736f4c8f3d5e [formerly feeea305a9
]
Former-commit-id: 23899a125f
2013-01-11 12:25:54 -06:00