Steve Harris
|
e72ec1d8b6
|
Merge branch 'omaha_13.5.1' into development
Former-commit-id: 0166f071d6 [formerly 1e5ef65d03] [formerly 0166f071d6 [formerly 1e5ef65d03] [formerly cb95c711fd [formerly bd6f53a77dade36b2fdc3057f5823562d5d11d4b]]]
Former-commit-id: cb95c711fd
Former-commit-id: cf11c28c9f [formerly 33bbec83ea]
Former-commit-id: 5343517c55
|
2013-06-18 09:04:11 -05:00 |
|
Roger Ferrel
|
0899652c38
|
Issue #1966 Column sort added; bug fixes to size estimates and saving files.
Change-Id: Idbce325b98281732312205d093ca09bd5313bcaa
Former-commit-id: e16bfeee80 [formerly f175b19a93] [formerly e16bfeee80 [formerly f175b19a93] [formerly c7c27c4cbb [formerly 195ba96c259535f00df44767c5dbc8777ece0e4c]]]
Former-commit-id: c7c27c4cbb
Former-commit-id: 28342fdfed [formerly cc39af5044]
Former-commit-id: 2b36404b6c
|
2013-06-18 08:56:54 -05:00 |
|
Richard Peter
|
92a9bf5677
|
Issue #1977: Fix merge, remove duplicate method alterProductParameters
Change-Id: I8ac066011f7ef2bfd6cd5941f38147e1127c19b2
Former-commit-id: 9d90349767 [formerly 9b8ef83ccb] [formerly 9d90349767 [formerly 9b8ef83ccb] [formerly 9f7739c7d5 [formerly 6a9a268de0fa84bc4b15ade022ba306d55508cf8]]]
Former-commit-id: 9f7739c7d5
Former-commit-id: 843cf307e8 [formerly 1d706b3b72]
Former-commit-id: 95bf734600
|
2013-06-17 19:01:20 -05:00 |
|
Steve Harris
|
01dee712d5
|
Merge branch 'omaha_13.5.1' into development
Conflicts:
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/PointSubsetManagerDlg.java
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java
Former-commit-id: 12248cade1 [formerly 43316cbff9] [formerly 12248cade1 [formerly 43316cbff9] [formerly 532d41787b [formerly df49d4d975e97a6b6c35e710dfd8244455eb21eb]]]
Former-commit-id: 532d41787b
Former-commit-id: 251b3c1a9e [formerly cb3e34813f]
Former-commit-id: 316d2ec667
|
2013-06-17 15:29:01 -05:00 |
|
Steve Harris
|
c27136275f
|
Merge branch 'master_13.5.1' into omaha_13.5.1
Conflicts (self-resolved with kdiff3):
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/StatsRecord.java
Former-commit-id: 41748175b6 [formerly 97631f9c62] [formerly 41748175b6 [formerly 97631f9c62] [formerly 40359c27c3 [formerly aac449bf94a60b1e2ab3bfcd2e97e310fd6ee414]]]
Former-commit-id: 40359c27c3
Former-commit-id: 0e4504c0fa [formerly 41fb06e6ea]
Former-commit-id: 9c75ca8493
|
2013-06-17 15:25:32 -05:00 |
|
Steve Harris
|
afc02d5731
|
13.5.1-2 baseline
Former-commit-id: bc60b22f00 [formerly adb779323d] [formerly bc60b22f00 [formerly adb779323d] [formerly 3386330894 [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]]
Former-commit-id: 3386330894
Former-commit-id: ccd66c0724 [formerly 3926dc20f7]
Former-commit-id: 332a74c4de
|
2013-06-17 15:01:22 -04:00 |
|
Mike Duff
|
1c50a0ecbf
|
Issue #2064 - Fixes for sort column in subscription manager and lat/lon text fields in area comp
Former-commit-id: 66d564dc43 [formerly 2fa207f744] [formerly 66d564dc43 [formerly 2fa207f744] [formerly e51778ae88 [formerly ecd47da65e0d1c9483f8b66568e655e434a2e442]]]
Former-commit-id: e51778ae88
Former-commit-id: 365d4be785 [formerly 5c58b973ab]
Former-commit-id: 069d2134e2
|
2013-06-17 13:15:34 -05:00 |
|
Lee Venable
|
0c297adabd
|
Merge "Issue #2079 add dispose method to ModeListener" into development
Former-commit-id: 1482e7f6dd [formerly 956a26aedc] [formerly 1482e7f6dd [formerly 956a26aedc] [formerly af0a542f2f [formerly f3619f573f102fcffd0503e0c0359e941568550f]]]
Former-commit-id: af0a542f2f
Former-commit-id: 430c19d19b [formerly 257de35a28]
Former-commit-id: 542de44fbd
|
2013-06-17 11:19:34 -05:00 |
|
Ben Steffensmeier
|
4c4c02e193
|
Issue #2107 Enable sampling by default for several display types.
Former-commit-id: 690c1f6756 [formerly 2f21ec16f4] [formerly 690c1f6756 [formerly 2f21ec16f4] [formerly b9d7e52fb8 [formerly d8ede3a25fc352d12631a33b0a43f5e9ddf8fd27]]]
Former-commit-id: b9d7e52fb8
Former-commit-id: ff7898b359 [formerly b4e6c647a3]
Former-commit-id: 02f80f3de5
|
2013-06-17 10:35:28 -05:00 |
|
Mike Duff
|
6a36caa011
|
Issue #2108 - Refactor DataSizeUtils
Change-Id: I0e633fcd69edbbb25b930ac4797ae0934655bd0f
Former-commit-id: 0411daa2b5 [formerly 532af54aae] [formerly 0411daa2b5 [formerly 532af54aae] [formerly 9d66579fb9 [formerly b6fffb21340d210a5a63d5f060f1dfe97b4868fb]]]
Former-commit-id: 9d66579fb9
Former-commit-id: b790996fec [formerly ed2ef22679]
Former-commit-id: 4205a90084
|
2013-06-14 12:30:11 -05:00 |
|
Richard Peter
|
b6dc024e78
|
Merge "Issue #1966 Added hooks for ArchiveRetentionDlg and changed CaseCreationDlg to extend AbstractArchiveDlg." into omaha_13.5.1
Former-commit-id: 16201b8155 [formerly bee6ba6698] [formerly 16201b8155 [formerly bee6ba6698] [formerly 8cdc6993d5 [formerly 012f486b1ccb26022137f9d9312a3c6c1b460b97]]]
Former-commit-id: 8cdc6993d5
Former-commit-id: 7d773e02ca [formerly 20b7af86f6]
Former-commit-id: 6851718b7e
|
2013-06-14 10:06:34 -05:00 |
|
Dustin Johnson
|
e6dd41f2be
|
Issue #2106 Speed up Bandwidth Manager subscription scheduling
Change-Id: Iafceeb64a2b56c562ca737ba083ec3225524f7ba
Former-commit-id: 52eda5be34 [formerly 2574f5a25d] [formerly 52eda5be34 [formerly 2574f5a25d] [formerly 8500856bc1 [formerly 693bfd77ddc216e658f6e1e4a38f48a2df1fe3bf]]]
Former-commit-id: 8500856bc1
Former-commit-id: 21df56fe4b [formerly b3cad4e40b]
Former-commit-id: 4735212532
|
2013-06-14 09:25:48 -05:00 |
|
Nate Jensen
|
c5d88a6dce
|
Issue #2102 improve error handling on thrift or http errors
Change-Id: I6b2cad4c2a73eb436354012838423d8ba02f2c6b
Former-commit-id: f55b3cbdbe [formerly c2faa0e3bf] [formerly f55b3cbdbe [formerly c2faa0e3bf] [formerly 0f6d897ff3 [formerly c38fb601bf4a360ab171e4d04f242e99f91710f2]]]
Former-commit-id: 0f6d897ff3
Former-commit-id: 4a39d586d2 [formerly 2200c7cded]
Former-commit-id: 853f5c7546
|
2013-06-13 11:39:30 -05:00 |
|
Roger Ferrel
|
fa9c9258cd
|
Issue #1966 Added hooks for ArchiveRetentionDlg and changed CaseCreationDlg to extend AbstractArchiveDlg.
Change-Id: If485480b6d8727d830620464741c2e748f2209dd
Former-commit-id: d2ac7bd433 [formerly 753f19b309] [formerly d2ac7bd433 [formerly 753f19b309] [formerly a405684c7b [formerly a9dd52d07b3eb8fd616e24374f40197c4df9b105]]]
Former-commit-id: a405684c7b
Former-commit-id: ab93641992 [formerly f64db73aef]
Former-commit-id: 09e36152db
|
2013-06-13 10:57:19 -05:00 |
|
Dustin Johnson
|
89b926e15e
|
Issue #2038 Correct required size estimations for subscription updates
Change-Id: I7994cb1492a4a541b6fe4720179fe928b3365db0
Former-commit-id: 757c711d2e [formerly 9156ec8c2d] [formerly 757c711d2e [formerly 9156ec8c2d] [formerly 94eeac2f7d [formerly 2fb575c534a756a835cc072429ba78a417d3c445]]]
Former-commit-id: 94eeac2f7d
Former-commit-id: e383aa83e1 [formerly c227436a3e]
Former-commit-id: f6b7d97fd2
|
2013-06-12 14:52:49 -05:00 |
|
Nate Jensen
|
c1478a71f2
|
Issue #2001 fix message priorities
Change-Id: I63b404133f081f7a373ca557adb25827033b1c6b
Former-commit-id: 5be268682a [formerly 4184cd436a] [formerly 5be268682a [formerly 4184cd436a] [formerly a31dd6af4c [formerly 10ec050edeea997c50d132dce12d2a78e723ea15]]]
Former-commit-id: a31dd6af4c
Former-commit-id: 4f65ea412d [formerly e91f05b0d3]
Former-commit-id: e1d3720fad
|
2013-06-12 12:07:34 -05:00 |
|
Mike Duff
|
ce60afe8db
|
Issue #2064 - Corrected Time object storage on subscriptions
Change-Id: I7cb4f53fd8dcdb2fc93ffd15c3a0c72e7eeb57d0
Former-commit-id: 5aabcd3001 [formerly a7f277c67b] [formerly 5aabcd3001 [formerly a7f277c67b] [formerly 0846f7c79a [formerly 250fb3c4f8df45d396bc76734ad8b198dcf40a4e]]]
Former-commit-id: 0846f7c79a
Former-commit-id: 1357c03113 [formerly ec08442f5d]
Former-commit-id: 0912f5e85e
|
2013-06-12 11:12:05 -05:00 |
|
Roger Ferrel
|
5935035391
|
Issue #2088 Changes for non-blocking RiverGageDlg, RiverProFcstGrpPointsDlg, RiverProGenParamsDlg and StatesCountiesZonesDlg.
Change-Id: I5f11ffd383622c49dcfbeb91e08904bad3a508b3
Former-commit-id: 31ef6d5563 [formerly 0c3841b243] [formerly 31ef6d5563 [formerly 0c3841b243] [formerly b87c394598 [formerly 769bc48479c0f5d69c54bf1d541ff1f9c89b0330]]]
Former-commit-id: b87c394598
Former-commit-id: 57124228e6 [formerly 24094e19bc]
Former-commit-id: 17d5e0f572
|
2013-06-12 08:26:14 -05:00 |
|
Mike Duff
|
4a7e558605
|
Issue #2064 - Fix editing of subscriptions
Change-Id: I4d04e4c099c2f898a5a6b13304bcea80b2776637
Former-commit-id: 1b4558f0cd [formerly b76a638951] [formerly 1b4558f0cd [formerly b76a638951] [formerly 208d1439ac [formerly 7c6c6ce1e129393316784d1fc4a24ea5d452f77f]]]
Former-commit-id: 208d1439ac
Former-commit-id: 31c80a63b2 [formerly d2f6dbca49]
Former-commit-id: 11e11a3fc2
|
2013-06-11 09:30:46 -05:00 |
|
Dustin Johnson
|
2f75f26b1d
|
Issue #2086 Move data delivery phase 3 code into AWIPS_baseline
Change-Id: I60bf6ac9d886d27c70543a0b7df24d626639fc3e
Former-commit-id: 063e68bc93 [formerly da69d3e630] [formerly 063e68bc93 [formerly da69d3e630] [formerly 1c7d99f53f [formerly c213b3b5552a2b11c69965bc6edcfb8acf7fa0a8]]]
Former-commit-id: 1c7d99f53f
Former-commit-id: 2b64936595 [formerly fef2708ff5]
Former-commit-id: 9220f1a199
|
2013-06-10 18:47:17 -05:00 |
|
Ben Steffensmeier
|
13d7b2e834
|
Issue #2041 Fix derived parameter record names.
Former-commit-id: 3c82b86f78 [formerly 29d8f65dc1] [formerly 3c82b86f78 [formerly 29d8f65dc1] [formerly bf0f61c08a [formerly 4bf73f41a59ca45db5eb7dd6440e12f44969e29c]]]
Former-commit-id: bf0f61c08a
Former-commit-id: 5a024637ea [formerly a950b35dc0]
Former-commit-id: a4eb6f0cb5
|
2013-06-10 16:34:12 -05:00 |
|
Steve Harris
|
859965fc9d
|
13.5.1-1 baseline
Former-commit-id: 6384018950 [formerly 998961612c] [formerly 6384018950 [formerly 998961612c] [formerly fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 0aab285b8a [formerly 30ba1d634e]
Former-commit-id: 146c5e8940
|
2013-06-10 15:17:17 -04:00 |
|
Richard Peter
|
ac4e4b0658
|
Merge "Issue #2038 Add support for point data type subscriptions to BandwidthManager" into development
Former-commit-id: 9c3d79ad8e [formerly 05c82feceb] [formerly 9c3d79ad8e [formerly 05c82feceb] [formerly 286d19c182 [formerly a64228266a146ecb9a27381d9422c7b9bef56dac]]]
Former-commit-id: 286d19c182
Former-commit-id: 3eeaf1db8b [formerly 11ebd89a2c]
Former-commit-id: 7dc49f0a5d
|
2013-06-10 11:46:13 -05:00 |
|
Nate Jensen
|
ecd6266db5
|
Merge "Issue #2070 Add geospatial constraints to metar precip requests. Change-Id: Ie7ce8ac0f3d2655c5e427aee0588b8546b1674d1" into development
Former-commit-id: 6c0fd7dfad [formerly 5d7d79bda3] [formerly 6c0fd7dfad [formerly 5d7d79bda3] [formerly 9b8a670d2c [formerly c0f155434889a7ef07b01a550fb463a8cb67a19c]]]
Former-commit-id: 9b8a670d2c
Former-commit-id: 75b10a8c97 [formerly 21dd33cc88]
Former-commit-id: 9480ce5563
|
2013-06-10 11:45:17 -05:00 |
|
Dustin Johnson
|
0fcd66162e
|
Issue #2038 Add support for point data type subscriptions to BandwidthManager
Amend: Peer review comments, improve time considerations for Point subscriptions
Change-Id: I9dde7f7da9dab9c8f3163a87b1ebe64303fc7dc2
Former-commit-id: 63f8ff76c3 [formerly 7c4a6261fc] [formerly 63f8ff76c3 [formerly 7c4a6261fc] [formerly c677ae32d7 [formerly f7ed3ec86188635eb069878ac490af06ea98e4a2]]]
Former-commit-id: c677ae32d7
Former-commit-id: ebf61027ff [formerly 3ec421b779]
Former-commit-id: b56641d370
|
2013-06-10 11:37:37 -05:00 |
|
Ben Steffensmeier
|
27c84bdd3e
|
Issue #2070 Add geospatial constraints to metar precip requests.
Change-Id: Ie7ce8ac0f3d2655c5e427aee0588b8546b1674d1
Former-commit-id: 984410e172 [formerly b94373379d] [formerly 984410e172 [formerly b94373379d] [formerly 3a6af1b023 [formerly fe7cfca3760374fdeac084158ddb6f1b1a4e5d54]]]
Former-commit-id: 3a6af1b023
Former-commit-id: 53e1764f61 [formerly 534ed9fc8d]
Former-commit-id: b49cb70a5e
|
2013-06-10 11:33:24 -05:00 |
|
Nate Jensen
|
676f62e39f
|
Merge "Issue #1981 - OUPRequest is now a privileged request. Also proctecting TafQueueRequest" into development
Former-commit-id: 965ac61515 [formerly 2b823f6758] [formerly 965ac61515 [formerly 2b823f6758] [formerly 474e0ac925 [formerly 35b47a9d54273ae8f9edcec731837cb85e928faf]]]
Former-commit-id: 474e0ac925
Former-commit-id: 3b4c9decfd [formerly beee941ae5]
Former-commit-id: bf3ba1e764
|
2013-06-10 11:02:01 -05:00 |
|
Nate Jensen
|
9bd02dfc30
|
Merge "Issue #2034 Clear all locks in resource catalog before runAsync." into development
Former-commit-id: 6b78ebc2ad [formerly 076cf33079] [formerly 6b78ebc2ad [formerly 076cf33079] [formerly 62252d23a8 [formerly d652b618cf6f93bb615572be1113390079a0902e]]]
Former-commit-id: 62252d23a8
Former-commit-id: 25b26b4856 [formerly 638c85ab3d]
Former-commit-id: 9e6b5c9cf1
|
2013-06-10 10:57:33 -05:00 |
|
Mike Duff
|
2d177bae94
|
Issue #1800 - Move the area control below the data type selection control
Change-Id: I22a0b014b5567452e7e996cfb4e2802945953219
Former-commit-id: 8a48d6bc5a [formerly 33a78a96ff] [formerly 8a48d6bc5a [formerly 33a78a96ff] [formerly 9c18c78b5d [formerly 67713f921582f6cb31b741257b84be60c9b645ff]]]
Former-commit-id: 9c18c78b5d
Former-commit-id: d53a983087 [formerly 8f3ca67532]
Former-commit-id: 6f8c3d3727
|
2013-06-07 15:55:27 -05:00 |
|
Mike Duff
|
1fd24b44e2
|
Issue #1981 - OUPRequest is now a privileged request.
Also proctecting TafQueueRequest
Change-Id: I3a05a407a21b8f9d2e6426c4f456e2218479242a
Former-commit-id: 386cdeeba6 [formerly ee5e9c1435] [formerly 386cdeeba6 [formerly ee5e9c1435] [formerly 37cdcc0b0b [formerly acc1b993db8d78f7edfc3bd287b7d3ca39c0d391]]]
Former-commit-id: 37cdcc0b0b
Former-commit-id: a614c16aba [formerly c293c466c1]
Former-commit-id: add586bb26
|
2013-06-07 15:52:02 -05:00 |
|
Ben Steffensmeier
|
0c33b8d761
|
Issue #2034 Clear all locks in resource catalog before runAsync.
Former-commit-id: 1b356e1e66 [formerly 843d3fc72c] [formerly 1b356e1e66 [formerly 843d3fc72c] [formerly ca07da6c53 [formerly c5f114678464b7b76d2189d56d0cd1131f834b71]]]
Former-commit-id: ca07da6c53
Former-commit-id: 8916bac6a0 [formerly 6982f56249]
Former-commit-id: ed075129cd
|
2013-06-07 15:36:57 -05:00 |
|
Richard Peter
|
57c6d49597
|
Merge "Issue #1966 Working case generation without compression. Changes to Retention to remove compile errors." into development
Former-commit-id: a24c41e40e [formerly 794b9a70f3] [formerly a24c41e40e [formerly 794b9a70f3] [formerly 878435ddd9 [formerly dd8e9aa61642ba6498bbf5871ed6c8372ec468d0]]]
Former-commit-id: 878435ddd9
Former-commit-id: d3913f5da9 [formerly 22ac30e0a6]
Former-commit-id: 7b3d65eb40
|
2013-06-07 15:05:08 -05:00 |
|
Richard Peter
|
9c47d78639
|
Merge "Issue #2043 Port Dcape to java. Change-Id: Ibcdd38fc47bb57eb6b2c6d0921d9790c2f1893ba" into development
Former-commit-id: 8cff202832 [formerly b48d4f7e4c] [formerly 8cff202832 [formerly b48d4f7e4c] [formerly 0c59016373 [formerly 2ef8dd363ac4d14f0ad16a147b7673034273741d]]]
Former-commit-id: 0c59016373
Former-commit-id: 03580afa7d [formerly 280a66a1b8]
Former-commit-id: 637c70ee10
|
2013-06-07 15:03:28 -05:00 |
|
Ben Steffensmeier
|
a533ca6526
|
Issue #2043 Port Dcape to java.
Change-Id: Ibcdd38fc47bb57eb6b2c6d0921d9790c2f1893ba
Former-commit-id: 9a3ea7c72b [formerly 6be12509e5] [formerly 9a3ea7c72b [formerly 6be12509e5] [formerly 660b04ba32 [formerly eddf7c71bb23057fe4e68a7462a634c6d81799d9]]]
Former-commit-id: 660b04ba32
Former-commit-id: 2c8cb2d329 [formerly 98dfa3f8b3]
Former-commit-id: 4404e55ab8
|
2013-06-07 13:44:25 -05:00 |
|
Matt Nash
|
b62e20dbd0
|
Issue #2079 add dispose method to ModeListener
Change-Id: Ib9b819f82009777a2418bfd50dcb29e405e6809f
Former-commit-id: afe539c8bc [formerly 3d51047d73] [formerly afe539c8bc [formerly 3d51047d73] [formerly 692d397c29 [formerly 1c1821d3ff02a95a953d7517c47f0a4a8f1c2f56]]]
Former-commit-id: 692d397c29
Former-commit-id: d753e0a2ce [formerly 8b1ae8f8b4]
Former-commit-id: f2dd51c6f6
|
2013-06-07 11:12:29 -05:00 |
|
Nate Jensen
|
38b2d467a1
|
Merge "Issue #2074 fix null capabilities when loading procedures having to do with non-existent plugins" into development
Former-commit-id: 905e5bd035 [formerly 03a377c552] [formerly 905e5bd035 [formerly 03a377c552] [formerly 14306cdf24 [formerly b2f4a27464ffb3f8f5bb9cdc16a7ff32028aa936]]]
Former-commit-id: 14306cdf24
Former-commit-id: c4e3ce3238 [formerly 93f81edb62]
Former-commit-id: 9586a00b2b
|
2013-06-07 10:30:14 -05:00 |
|
Matt Nash
|
22b8f97a01
|
Issue #2074 fix null capabilities when loading procedures having to do with non-existent plugins
Change-Id: I83b62fbdc4688b9b330a4485111fe77c0a12beff
Former-commit-id: 1be3d92574 [formerly 3411b8df93] [formerly 1be3d92574 [formerly 3411b8df93] [formerly d51e3f2e94 [formerly 7124abddfa9f066e6c7424992d84b403fd1f6d4c]]]
Former-commit-id: d51e3f2e94
Former-commit-id: ab07925544 [formerly 849659a625]
Former-commit-id: 4bb16697c9
|
2013-06-07 10:07:58 -05:00 |
|
Mike Duff
|
ecc7838d42
|
Issue #2064 - fixes for requested envelope, adding all parameters to
subscription, and subscription manager filtering
Review comments
Change-Id: Iabab607b828ffa2ce7c75047d0d1647a243132f4
Former-commit-id: 8e25a52752 [formerly 1069f21613] [formerly 8e25a52752 [formerly 1069f21613] [formerly 4502177208 [formerly d3799ccf79d88e2048471d7452590d4d174326b3]]]
Former-commit-id: 4502177208
Former-commit-id: 6bc963888d [formerly d194aca5ab]
Former-commit-id: d19e5a420f
|
2013-06-06 22:53:29 -05:00 |
|
Mike Duff
|
089bfef8ed
|
Issue #2076 - fix hydro TS control dialog station list selection and graph button enabling
Change-Id: I4e53b03fe12453dd8c78231c20fba6889833db9e
Former-commit-id: 632e7e9ba1 [formerly 7e9c529c60] [formerly 632e7e9ba1 [formerly 7e9c529c60] [formerly 9a4f0e8679 [formerly ae2c0314eef5998aabcf9323ef33de7cdf378a7f]]]
Former-commit-id: 9a4f0e8679
Former-commit-id: ca96e8fd1e [formerly 779cc0f765]
Former-commit-id: 3bf6be1299
|
2013-06-06 17:14:34 -05:00 |
|
Steve Harris
|
18fdb31920
|
Merge branch 'omaha_13.4.1' into development
Conflicts:
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/datacatalog/PointDataCatalog.java
Former-commit-id: 64cf1aedb1 [formerly 571757b2a6] [formerly 64cf1aedb1 [formerly 571757b2a6] [formerly 2327205cb7 [formerly 43499d1a76f65804a5e74894cad3186765de3501]]]
Former-commit-id: 2327205cb7
Former-commit-id: 8b78f538d3 [formerly 035d74b348]
Former-commit-id: abfd0b9ead
|
2013-06-06 15:46:23 -05:00 |
|
Steve Harris
|
7d8ae66ddf
|
Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: b0c0e2e7cf [formerly 1e4c538e58] [formerly b0c0e2e7cf [formerly 1e4c538e58] [formerly 56e04554e9 [formerly 2e1e30df32ef00523dbcd995457b854cbcad3d41]]]
Former-commit-id: 56e04554e9
Former-commit-id: 1d4e65d435 [formerly 72a559120f]
Former-commit-id: 4b06eb1152
|
2013-06-06 15:43:34 -05:00 |
|
Steve Harris
|
d46b0413fb
|
13.4.1-14 baseline
Former-commit-id: be236eb722 [formerly c749e122eb] [formerly be236eb722 [formerly c749e122eb] [formerly 18b90226a2 [formerly 0e4ca3ea4159ea0256e22f9814f0de85180a41fb]]]
Former-commit-id: 18b90226a2
Former-commit-id: cebc1ddb63 [formerly dee685e3c7]
Former-commit-id: 8ec7524cbb
|
2013-06-06 15:15:27 -04:00 |
|
Nate Jensen
|
cb59f0f3b2
|
Merge "Issue #2072 Fix concurrency problems when init is called before time matching is done." into development
Former-commit-id: 17f0a8426b [formerly b9464b7adf] [formerly 17f0a8426b [formerly b9464b7adf] [formerly c6c999b17e [formerly 88606cb2aef6e92e39ca5947c28784f5bc5b919c]]]
Former-commit-id: c6c999b17e
Former-commit-id: d97cf61de1 [formerly 4b9424bee3]
Former-commit-id: 1dedd423b2
|
2013-06-06 14:13:09 -05:00 |
|
Nate Jensen
|
aeb1d5da07
|
Merge "Issue #2068 Unpack viz cots plugins." into development
Former-commit-id: 58cc50e6f8 [formerly 050f48c204] [formerly 58cc50e6f8 [formerly 050f48c204] [formerly 65af14d99c [formerly 4a60beb7ab6d44d30fd9d4c9c7486a95d5581cb2]]]
Former-commit-id: 65af14d99c
Former-commit-id: 5ff4dafed0 [formerly 248ce85b36]
Former-commit-id: 52c499d544
|
2013-06-06 14:11:53 -05:00 |
|
Lee Venable
|
5f11afd978
|
Merge "Issue #2071 - refactor data delivery help dialogs" into development
Former-commit-id: a18a364f8e [formerly 791f9e93aa] [formerly a18a364f8e [formerly 791f9e93aa] [formerly ac6df52b0d [formerly 14f9efda965a700d9e701e36a3ff2e56d78b1dba]]]
Former-commit-id: ac6df52b0d
Former-commit-id: bc92d23e99 [formerly a034c677d1]
Former-commit-id: fa9c7e1bdb
|
2013-06-06 14:06:53 -05:00 |
|
Ben Steffensmeier
|
74fb3d5a47
|
Issue #2072 Fix concurrency problems when init is called before time matching is done.
Former-commit-id: 14750f4724 [formerly 0ed736513c] [formerly 14750f4724 [formerly 0ed736513c] [formerly 0842b9d292 [formerly 79bec984b094fc84bfb9da3e5c20796844e9bbbf]]]
Former-commit-id: 0842b9d292
Former-commit-id: b6c9b3d2c6 [formerly 6b1a7700dd]
Former-commit-id: 1c8a3b9cb1
|
2013-06-06 13:23:29 -05:00 |
|
Ben Steffensmeier
|
c30e3bd615
|
Issue #2068 Unpack viz cots plugins.
Former-commit-id: 62c3bc9bbe [formerly a1a44cdc7a] [formerly 62c3bc9bbe [formerly a1a44cdc7a] [formerly 073ad47a7d [formerly 5a76cddc79705708969b37de530ad0bce2c26505]]]
Former-commit-id: 073ad47a7d
Former-commit-id: b117268b67 [formerly 7f9cf6d46d]
Former-commit-id: 486ea54d69
|
2013-06-06 13:17:50 -05:00 |
|
Mike Duff
|
ad9f567037
|
Issue #2071 - refactor data delivery help dialogs
Change-Id: I4820f1847e0228f0fcd6166b8dd13e289623a3a0
Former-commit-id: d218159b3b [formerly e579626dea] [formerly d218159b3b [formerly e579626dea] [formerly 22132fbef8 [formerly 7734c4d8ef387c47f32930541a5fc5c09f3261fe]]]
Former-commit-id: 22132fbef8
Former-commit-id: f507b7afab [formerly c37e75e0f7]
Former-commit-id: 545c7c80f4
|
2013-06-06 12:33:45 -05:00 |
|
Roger Ferrel
|
79d8cc2c75
|
Issue #1966 Working case generation without compression. Changes to Retention to remove compile errors.
Change-Id: I6ecfe7d9a4b352318b718849ba7e62b24254385d
Former-commit-id: 147a321455 [formerly b645cd6079] [formerly 147a321455 [formerly b645cd6079] [formerly 0737075420 [formerly 43a4ee08b063e1e2aba5035b964cf0b93462885b]]]
Former-commit-id: 0737075420
Former-commit-id: f5756aa417 [formerly 47b72d3a5a]
Former-commit-id: 51af7208a1
|
2013-06-06 12:27:38 -05:00 |
|
Lee Venable
|
85a068fab9
|
Issue #2065 Added code to alert user to use the clear button to close SCAN dialogs
Change-Id: I9668a953f76a4dfa1ff4fb61ff6b15e21f77d755
Former-commit-id: 6b6d351996 [formerly 2099f63370] [formerly 6b6d351996 [formerly 2099f63370] [formerly ef425c9807 [formerly 399a031eeb9e3eeabf60533cae11df7062446797]]]
Former-commit-id: ef425c9807
Former-commit-id: cece058287 [formerly 08b70b3bcb]
Former-commit-id: 3a11e51ff9
|
2013-06-06 12:04:33 -05:00 |
|