Ben Steffensmeier
|
c28a151884
|
Issue #1731 Optimize construction of scan resource.
Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b
Former-commit-id: b0870c55f6 [formerly 86b9a4d8c2] [formerly b0870c55f6 [formerly 86b9a4d8c2] [formerly 9263ff1846 [formerly f97d09f3ee362f0f0b6155e0bb704ffd3611ca1a]]]
Former-commit-id: 9263ff1846
Former-commit-id: 8f4c2f2a39 [formerly 5a149c5dfa]
Former-commit-id: 77aef5f955
|
2013-03-01 11:03:11 -06:00 |
|
Richard Peter
|
9acad5a1a4
|
Merge "Issue #1744 actually fix deadlock this time" into omaha_13.3.1
Former-commit-id: f2ae906f93 [formerly 1754861897] [formerly f2ae906f93 [formerly 1754861897] [formerly c50e1cbe1c [formerly 7eafcb1e677fafadc039a5106f296dbee1245136]]]
Former-commit-id: c50e1cbe1c
Former-commit-id: db5e8ed2dd [formerly 6fd7af5362]
Former-commit-id: a221c92731
|
2013-03-01 10:50:33 -06:00 |
|
Nate Jensen
|
312e2e07ae
|
Issue #1744 actually fix deadlock this time
Change-Id: I9c5468d4d7d8fe19e709bc9cce42f06ca60d3eeb
Former-commit-id: 3dc69632c1 [formerly 8c84bc5fbb] [formerly 3dc69632c1 [formerly 8c84bc5fbb] [formerly 35007e0460 [formerly 56d6dd7fb0d16ef5fdb545e816fedddb28273024]]]
Former-commit-id: 35007e0460
Former-commit-id: 348f5f0f41 [formerly 33da766f63]
Former-commit-id: eec5f87ab2
|
2013-03-01 10:48:03 -06:00 |
|
Richard Peter
|
a34559065c
|
Merge "Issue #1744 fix deadlock" into omaha_13.3.1
Former-commit-id: ee1b0df106 [formerly 79c70dacbd] [formerly ee1b0df106 [formerly 79c70dacbd] [formerly 7dcc007bee [formerly 6fbc789e08a5e6baf7ae6ff1348e1e2c5709c422]]]
Former-commit-id: 7dcc007bee
Former-commit-id: 73ea950d5f [formerly 3a8a2f5815]
Former-commit-id: 5a05a66757
|
2013-03-01 10:27:36 -06:00 |
|
Nate Jensen
|
65ae433077
|
Merge "Issue #1731 Remove unneccessary query in getDataStore." into omaha_13.3.1
Former-commit-id: 308de6885f [formerly d695473b0f] [formerly 308de6885f [formerly d695473b0f] [formerly 302e851b67 [formerly 94e54241b7e85c523e019603cd9e815c179dc584]]]
Former-commit-id: 302e851b67
Former-commit-id: a7cc38e3ba [formerly 0d0dfb474f]
Former-commit-id: d03d447447
|
2013-03-01 10:15:46 -06:00 |
|
Nate Jensen
|
46ceab84c1
|
Issue #1744 fix deadlock
Change-Id: I2cff166dcdb217e0c7665deece302e5c9ac92c8f
Former-commit-id: e2f12d16b7 [formerly 2a575a24e7] [formerly e2f12d16b7 [formerly 2a575a24e7] [formerly f4cccabc07 [formerly 48ef00523488cdf4f65b86c5b74331f908192191]]]
Former-commit-id: f4cccabc07
Former-commit-id: c5600acf79 [formerly f7ffa22c7c]
Former-commit-id: c990477402
|
2013-03-01 10:12:56 -06:00 |
|
Ben Steffensmeier
|
12ce3faeb1
|
Issue #1731 Allow ScanResource to work better with D2DTimeMatcher.
Former-commit-id: 74296b32db [formerly df38a21e11] [formerly 74296b32db [formerly df38a21e11] [formerly aaffde9bf5 [formerly 5909f8c7f9c89d3393a2ce6fd3dbf410c6d44c4b]]]
Former-commit-id: aaffde9bf5
Former-commit-id: f49b8cec68 [formerly 453723dc9d]
Former-commit-id: dbb965cf9d
|
2013-02-28 14:04:53 -06:00 |
|
Ben Steffensmeier
|
bec51951ec
|
Issue #1731 Remove unneccessary query in getDataStore.
Former-commit-id: 61875750c1 [formerly 52a64eda01] [formerly 61875750c1 [formerly 52a64eda01] [formerly 38728f3073 [formerly e78a920afcf25b94d5ea473f96d548ce227ea435]]]
Former-commit-id: 38728f3073
Former-commit-id: 4bdd2946ee [formerly 586438b393]
Former-commit-id: 303c30040d
|
2013-02-28 13:59:02 -06:00 |
|
Richard Peter
|
014bf4250b
|
Merge "Issue #1597 Moved some interpolation messages to Performance Log for consistency." into omaha_13.3.1
Former-commit-id: 2950dc9c42 [formerly 1ce1fb213b] [formerly 2950dc9c42 [formerly 1ce1fb213b] [formerly a9ffc8b170 [formerly f4e326c44178ab01b6c5a7c4514dbdd5c9e00cba]]]
Former-commit-id: a9ffc8b170
Former-commit-id: 7adde5c3aa [formerly c0e0a44e5f]
Former-commit-id: 93494fcea0
|
2013-02-27 16:16:09 -06:00 |
|
Richard Peter
|
7585176f50
|
Merge "Issue #1659 Add time agnostic caching to grid derived parameters Change-Id: I59db267004a7acd51642c4360404e96d50378480" into omaha_13.3.1
Former-commit-id: 7c1c44c22f [formerly 6535c1b6c7] [formerly 7c1c44c22f [formerly 6535c1b6c7] [formerly 656d9d74ae [formerly ac6f072dbb19afe6dd76bfd368167ea60c2c8d00]]]
Former-commit-id: 656d9d74ae
Former-commit-id: b3c0f56954 [formerly ba4a86de16]
Former-commit-id: 706ec91548
|
2013-02-27 14:46:49 -06:00 |
|
Ron Anderson
|
6322f61325
|
Issue #1597 Moved some interpolation messages to Performance Log for consistency.
Change-Id: I1bd047ada89b0e9876549c6153d06c82e4dfc5c8
Former-commit-id: f491d7f7c3 [formerly c9ca7a2943] [formerly f491d7f7c3 [formerly c9ca7a2943] [formerly 079cdbcb29 [formerly 4683ff00b8bc515fc2f802810fc2caba37c282d8]]]
Former-commit-id: 079cdbcb29
Former-commit-id: b2bffcf0de [formerly a5195e137e]
Former-commit-id: ad73782c8b
|
2013-02-27 14:45:30 -06:00 |
|
Bryan Kowal
|
8210c0d984
|
Issue #1662 - wrapper parameters can now be used to specify the order
of jvm parameters since yajsw does not enforce the ordering or
uniqueness of jvm argument parameters
Change-Id: I9485d2a2992adfb37cade0e6977aab27e3a3217c
Former-commit-id: 5b3478d6c7 [formerly 8bf5e3ffad] [formerly 5b3478d6c7 [formerly 8bf5e3ffad] [formerly 44349717fb [formerly aae64b29491d8da0001cf1182a357683546d4593]]]
Former-commit-id: 44349717fb
Former-commit-id: 65fb00c3c3 [formerly 4f7fed259c]
Former-commit-id: dc46b8eeb1
|
2013-02-27 12:46:48 -06:00 |
|
Ben Steffensmeier
|
3a3f083a15
|
Issue #1659 Add time agnostic caching to grid derived parameters
Change-Id: I59db267004a7acd51642c4360404e96d50378480
Former-commit-id: ebfedad360 [formerly db1028ee7a] [formerly ebfedad360 [formerly db1028ee7a] [formerly 6d85856e60 [formerly 9685d0b363f21afbb42df02e9871884123d75e2c]]]
Former-commit-id: 6d85856e60
Former-commit-id: 0b2373ab4d [formerly 8112f669b3]
Former-commit-id: bbf4ced67d
|
2013-02-27 12:37:14 -06:00 |
|
Ron Anderson
|
cb2ec02843
|
Issue #1708 Clean up error handling for scripts with errors. Remove some verbose logging.
Change-Id: Ic05b985cf6cb79299fb55dc9eee4b3205ed3fb27
Former-commit-id: 50f5e44b39 [formerly 36be1c5850] [formerly 50f5e44b39 [formerly 36be1c5850] [formerly c35e06d82c [formerly cb612d51394a261d12826d6d3ea9553f399ed2a9]]]
Former-commit-id: c35e06d82c
Former-commit-id: e240568bb9 [formerly 5bd0dbcfca]
Former-commit-id: d75331a5c9
|
2013-02-27 12:34:40 -06:00 |
|
Ron Anderson
|
48abd41c6e
|
Issue #1708 Fix redundant excution of evaluateQuery.
Change-Id: Ic41ac2b455755a59c189fa5ec0ca63b45bfca80a
Former-commit-id: 2212f333a3 [formerly a5a273c1c2] [formerly 2212f333a3 [formerly a5a273c1c2] [formerly 274ce762d8 [formerly 2528719c05a9c57ca56a6d6e56ed3ae853d5b860]]]
Former-commit-id: 274ce762d8
Former-commit-id: 93382aeed8 [formerly 84bd642290]
Former-commit-id: 36f44524d0
|
2013-02-26 19:00:56 -06:00 |
|
Ron Anderson
|
59c7ee5120
|
Issue #1597 Code cleanup and logging improvement for GFE Performance metrics
Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765
Former-commit-id: d43afc8c67 [formerly bfe3c684df] [formerly d43afc8c67 [formerly bfe3c684df] [formerly f37999b1eb [formerly 0b4b49014598aeb94492d0b713afe17732c6e029]]]
Former-commit-id: f37999b1eb
Former-commit-id: 541557e0b0 [formerly 77fbbb6a61]
Former-commit-id: 92abcad349
|
2013-02-26 18:44:51 -06:00 |
|
Nate Jensen
|
0ac9146923
|
Merge "Issue #1642: Fix QPID Deadlock scenario - Address peer review comments" into development
Former-commit-id: a020438c99 [formerly 58957d30e5] [formerly a020438c99 [formerly 58957d30e5] [formerly 24c94ef55b [formerly 1206430bc0142b0facee03ee95e4bd5fc8c0305a]]]
Former-commit-id: 24c94ef55b
Former-commit-id: 652ac25d12 [formerly b6fc51a18c]
Former-commit-id: 841ddd8509
|
2013-02-26 18:00:50 -06:00 |
|
Richard Peter
|
294914b403
|
Issue #1642: Fix QPID Deadlock scenario
- Address peer review comments
Change-Id: I3c52fd57f762a762d54fdce3651c7f17a8fc6462
Former-commit-id: 7d4206420c [formerly 9a0177861f] [formerly 7d4206420c [formerly 9a0177861f] [formerly 5b2650599d [formerly 2071d4f3cc54a3da43443bc71cecf038736194d8]]]
Former-commit-id: 5b2650599d
Former-commit-id: ea806139d3 [formerly 4deaf372a1]
Former-commit-id: e964d248fe
|
2013-02-26 16:01:25 -06:00 |
|
Dustin Johnson
|
6bb570ce5c
|
Issue #1643 Standardize access for EDEX service requests, separate router code into its own Spring file.
Change-Id: Ic32df9138b270d1e2c3a9d137d2ad292706ab5b7
Former-commit-id: 8038b840d8 [formerly 7852f88352] [formerly 8038b840d8 [formerly 7852f88352] [formerly 88a9b953b6 [formerly 6ab17d82c5e4961e662acf80e26d23f3bbfaada2]]]
Former-commit-id: 88a9b953b6
Former-commit-id: 94300e0c1d [formerly cc0254ba03]
Former-commit-id: 2d6df74b67
|
2013-02-26 15:06:04 -06:00 |
|
Lee Venable
|
1dff036c6a
|
Merge "Issue #1667 - Sort categories in the Stats Dialog's catgory drop-down" into development
Former-commit-id: a4b41e0309 [formerly 9cf3ca07b7] [formerly a4b41e0309 [formerly 9cf3ca07b7] [formerly 46ff81108a [formerly 26fa358838588643c003287d8125e58949c3648f]]]
Former-commit-id: 46ff81108a
Former-commit-id: 4212af7e8a [formerly cb7fd87715]
Former-commit-id: 7b9ed39534
|
2013-02-26 14:11:35 -06:00 |
|
Mike Duff
|
a62b8b824e
|
Issue #1667 - Sort categories in the Stats Dialog's catgory drop-down
Change-Id: I92016564da48f7f736bebf58fdc0afca5cc1d9ff
Former-commit-id: fdd5e903c6 [formerly b48e70fff4] [formerly fdd5e903c6 [formerly b48e70fff4] [formerly c77602652e [formerly 1d9c456b697a79f6093550a26cb3d2d4f972548d]]]
Former-commit-id: c77602652e
Former-commit-id: 882c46dd85 [formerly 3071eb8456]
Former-commit-id: bb240a10db
|
2013-02-26 14:03:55 -06:00 |
|
Nate Jensen
|
360b33b854
|
Merge "Issue #1668 add gsd pattern to allow for their plugins to be deployed" into development
Former-commit-id: 15c4c4dfa0 [formerly b062299796] [formerly 15c4c4dfa0 [formerly b062299796] [formerly 36d4eff2c6 [formerly 03591924b4efdc13f1cc01182d39e280309cf381]]]
Former-commit-id: 36d4eff2c6
Former-commit-id: b173d34ba9 [formerly 5c33098315]
Former-commit-id: c06d4abcee
|
2013-02-26 13:53:40 -06:00 |
|
Nate Jensen
|
66e2da8c31
|
Merge "Issue #1506 fix deadlock and edit areas showing up from query" into development
Former-commit-id: f5ebeb1330 [formerly 1e50b3a0e8] [formerly f5ebeb1330 [formerly 1e50b3a0e8] [formerly 4e60fa682d [formerly 698d1d88b5c67498046dcec558361797a01b07f5]]]
Former-commit-id: 4e60fa682d
Former-commit-id: 2b81ce6028 [formerly e1660e51f8]
Former-commit-id: eced16c428
|
2013-02-26 13:46:30 -06:00 |
|
Dustin Johnson
|
7b73dbc256
|
Merge "Issue #1592 Don't submit adhoc query when X button clicked" into development
Former-commit-id: 074fb0aa64 [formerly 47cb278c01] [formerly 074fb0aa64 [formerly 47cb278c01] [formerly d31392d740 [formerly bf86849d284696553ed4cbc3f347afe2f791968d]]]
Former-commit-id: d31392d740
Former-commit-id: 8e4a990d1a [formerly a7d4b23597]
Former-commit-id: abf85b6b0e
|
2013-02-26 13:41:46 -06:00 |
|
Dustin Johnson
|
8502d29497
|
Merge "Issue #1643 Add NCF bandwidth manager router" into development
Former-commit-id: 50b412b34e [formerly 42402c5d73] [formerly 50b412b34e [formerly 42402c5d73] [formerly fb235e3f43 [formerly e2bb08df9a9aa2ac143e0f7fc82b911f72b4b87c]]]
Former-commit-id: fb235e3f43
Former-commit-id: 4153bdd79e [formerly a648519673]
Former-commit-id: 50e749e38e
|
2013-02-26 13:41:36 -06:00 |
|
Dustin Johnson
|
7bc8125917
|
Merge "Issue #1588 - Fix match any/all in data browser dialog" into development
Former-commit-id: 3dd36d29cf [formerly fb38cceecd] [formerly 3dd36d29cf [formerly fb38cceecd] [formerly 76738dbf7d [formerly 00e1133e53664a0b8a22a17ca5880736a0f93502]]]
Former-commit-id: 76738dbf7d
Former-commit-id: bb5f6cc568 [formerly b77ebdc924]
Former-commit-id: 77f811d090
|
2013-02-26 13:37:14 -06:00 |
|
Matt Nash
|
2841c495af
|
Issue #1668 add gsd pattern to allow for their plugins to be deployed
Change-Id: Icbabbdd188557d8f6143e026e4165fc12a51a0d6
Former-commit-id: 41bbd4cf2d [formerly a2fb0db684] [formerly 41bbd4cf2d [formerly a2fb0db684] [formerly 051b36ad73 [formerly 41c12ff165a6f90edc1cd78aed0ae0053d137bb2]]]
Former-commit-id: 051b36ad73
Former-commit-id: 32096feba8 [formerly b1fe380c44]
Former-commit-id: 1c51407ffd
|
2013-02-26 13:29:04 -06:00 |
|
Matt Nash
|
feb05cfeda
|
Issue #1506 fix deadlock and edit areas showing up from query
Change-Id: I1a8f8adbb4a6e737c06a6c906cd4db0926254b49
Former-commit-id: 4be89bdd43 [formerly c728f72ea3] [formerly 4be89bdd43 [formerly c728f72ea3] [formerly b749edca54 [formerly 5fd67088da350141cc97d90346272843dfc7ff5d]]]
Former-commit-id: b749edca54
Former-commit-id: daea84a1e8 [formerly 51e6302178]
Former-commit-id: 18ccbd7c5d
|
2013-02-26 12:20:08 -06:00 |
|
Dustin Johnson
|
5ee13ae1b3
|
Issue #1592 Don't submit adhoc query when X button clicked
Change-Id: I7a06857fa64a6d54279ec2dca1404062179fe279
Former-commit-id: 604a7c82b2 [formerly 598eb88a04] [formerly 604a7c82b2 [formerly 598eb88a04] [formerly c6975aa379 [formerly 9cb2114c239e6782961e8127fe85b10a7ee38f06]]]
Former-commit-id: c6975aa379
Former-commit-id: 898d7500aa [formerly ab1dc2272b]
Former-commit-id: 21bd89a9fd
|
2013-02-26 12:07:36 -06:00 |
|
Dustin Johnson
|
fa87f70100
|
Issue #1643 Add NCF bandwidth manager router
Change-Id: I226bf657469eccc68c29cb21dac10cc10e562ca8
Former-commit-id: ebf02481f0 [formerly d58d28c636] [formerly ebf02481f0 [formerly d58d28c636] [formerly 722e41b8b0 [formerly 2b52368c81272df18f3af1334057295d11bb4b52]]]
Former-commit-id: 722e41b8b0
Former-commit-id: 219e882fc5 [formerly cf86c92fad]
Former-commit-id: b62631b9d1
|
2013-02-26 11:32:03 -06:00 |
|
Steve Harris
|
1e41b4a44a
|
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 7ed1eacb6b [formerly 9bcabe2c5d] [formerly 7ed1eacb6b [formerly 9bcabe2c5d] [formerly 098b1e1579 [formerly 16bc4b8c4e0261039a6c689afb4220f2ca6d904a]]]
Former-commit-id: 098b1e1579
Former-commit-id: 41e1594be7 [formerly 57440abebb]
Former-commit-id: 3df38c0fc6
|
2013-02-25 20:41:26 -06:00 |
|
Richard Peter
|
5618a65540
|
Merge "Issue #1659 Stop derived parameters from sending empty requests for cached times" into development
Former-commit-id: 2553955249 [formerly be9370576a] [formerly 2553955249 [formerly be9370576a] [formerly 1669945cdb [formerly 53850dcdaf54d9ef74bb08cca5b966c448cc054e]]]
Former-commit-id: 1669945cdb
Former-commit-id: 56771955b4 [formerly aa5f3c80a0]
Former-commit-id: d1917a79a2
|
2013-02-25 17:47:14 -06:00 |
|
Richard Peter
|
4fbbfc52c9
|
Merge "Issue #1659 Add PDOs to D2DGridResource in constructor to avoid duplicate data requests." into development
Former-commit-id: af33dd1743 [formerly b98bdb3d81] [formerly af33dd1743 [formerly b98bdb3d81] [formerly 3b718bea52 [formerly bedfb6a21680961421b42bcbcec470e41bb9523d]]]
Former-commit-id: 3b718bea52
Former-commit-id: 25909b2ee1 [formerly c21a1e9f61]
Former-commit-id: 731710f355
|
2013-02-25 17:46:26 -06:00 |
|
Lee Venable
|
de7c07dcab
|
Merge "Issue #1625 Updated addOrRemoveCounty method." into development
Former-commit-id: e54eb4ab55 [formerly e024e4e087] [formerly e54eb4ab55 [formerly e024e4e087] [formerly 7f769af427 [formerly cda14b7c5e6563a9165fa734f35766816bccccf1]]]
Former-commit-id: 7f769af427
Former-commit-id: 444a1f5d47 [formerly 0125935a7f]
Former-commit-id: 8af64a568d
|
2013-02-25 17:25:56 -06:00 |
|
Jonathan Sanchez
|
f0a64fa33f
|
Issue #1625 Updated addOrRemoveCounty method.
Former-commit-id: f59a08963c [formerly cd6dd3c178] [formerly f59a08963c [formerly cd6dd3c178] [formerly 8c2c7c97f7 [formerly 18760c0895c1776dd0448b0bb699ab5506c45511]]]
Former-commit-id: 8c2c7c97f7
Former-commit-id: c861c71ae6 [formerly d4f4832d1a]
Former-commit-id: b275cdf701
|
2013-02-25 17:15:09 -06:00 |
|
Ben Steffensmeier
|
677412cf10
|
Issue #1659 Stop derived parameters from sending empty requests for cached times
Former-commit-id: ff232b87b4 [formerly 71652af086] [formerly ff232b87b4 [formerly 71652af086] [formerly 9edeadc966 [formerly 9605118022d378eb35c38d784729410d160d46df]]]
Former-commit-id: 9edeadc966
Former-commit-id: 9ec0008743 [formerly d6c59cb85a]
Former-commit-id: de75bbf5a7
|
2013-02-25 17:08:12 -06:00 |
|
Ben Steffensmeier
|
c324ba1b1a
|
Issue #1659 Add PDOs to D2DGridResource in constructor to avoid duplicate data requests.
Former-commit-id: f56b305581 [formerly fd2450c0df] [formerly f56b305581 [formerly fd2450c0df] [formerly 2fa5fb488e [formerly 4826ccdd4db42342f913cfc9e9fef6bc276dcea9]]]
Former-commit-id: 2fa5fb488e
Former-commit-id: 5e1b9383a5 [formerly e1e7a12ca2]
Former-commit-id: bb8554031f
|
2013-02-25 16:58:25 -06:00 |
|
Nate Jensen
|
6e50b1f914
|
Merge "Issue #1659 Cache station in StationUtils" into development
Former-commit-id: c7d01eb0c5 [formerly bbbdc17c06] [formerly c7d01eb0c5 [formerly bbbdc17c06] [formerly 66e1411de1 [formerly 70f064bed284629fe521ac8d3596cb8ac798c0c7]]]
Former-commit-id: 66e1411de1
Former-commit-id: 7201499124 [formerly 135006ff0c]
Former-commit-id: 2e3f3f66b3
|
2013-02-25 16:56:55 -06:00 |
|
Ben Steffensmeier
|
932db84314
|
Issue #1659 Cache station in StationUtils
Former-commit-id: 0ff907499c [formerly 842437870e] [formerly 0ff907499c [formerly 842437870e] [formerly 39bf907df7 [formerly 5bd8303893ad59a23571c0564984b21da9ffe785]]]
Former-commit-id: 39bf907df7
Former-commit-id: 8ebeb61cea [formerly 5be0eab696]
Former-commit-id: 02f1f6a065
|
2013-02-25 16:25:55 -06:00 |
|
Steve Harris
|
108abd5e69
|
Merge branch 'master_13.3.1' into omaha_13.3.1
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
Former-commit-id: cd99e680bb [formerly b50e384a0f] [formerly cd99e680bb [formerly b50e384a0f] [formerly e8135b9c14 [formerly 2506058a672fce230e445bcc5bf8ae2f52df0766]]]
Former-commit-id: e8135b9c14
Former-commit-id: 901cbbf56d [formerly 2398ef1e85]
Former-commit-id: 1d8b6e0256
|
2013-02-25 16:05:22 -06:00 |
|
Steve Harris
|
9db68d0585
|
Merge branch 'development' into omaha_13.3.1
Former-commit-id: 0a4564eb97 [formerly 67f090638f] [formerly 0a4564eb97 [formerly 67f090638f] [formerly 6ec9e73035 [formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]]
Former-commit-id: 6ec9e73035
Former-commit-id: e46625f8f2 [formerly 0051276ad1]
Former-commit-id: 140ae3191c
|
2013-02-25 15:58:48 -06:00 |
|
Steve Harris
|
225af35fbe
|
13.3.1-3 baseline
Merge branch 'master_13.3.1' of ../ss_build_transfer_copy into master_13.3.1
conflicts resolved by 'theirs' strategy (all of 13.3.1-10)
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 07167ec04f [formerly cf951785c8] [formerly 07167ec04f [formerly cf951785c8] [formerly db761c0f19 [formerly 8c1e3bc2413a6e1e6644f8ba8812edf591557f29]]]
Former-commit-id: db761c0f19
Former-commit-id: 988430b44d [formerly 62e15dacdb]
Former-commit-id: f14049cf3f
|
2013-02-25 15:54:24 -06:00 |
|
Mike Duff
|
7fc320844f
|
Issue #1588 - Fix match any/all in data browser dialog
Change-Id: I30491d170611f3eec44adcf8b2bd99a445c09a49
Former-commit-id: 0d2c817680 [formerly d00a790d7b] [formerly 0d2c817680 [formerly d00a790d7b] [formerly 086d24acc8 [formerly b9945e70a6b96a2f4b1c24b2308bb424e4cd7ee5]]]
Former-commit-id: 086d24acc8
Former-commit-id: dccb6b94b9 [formerly 1365596d4d]
Former-commit-id: ce30c45c88
|
2013-02-25 15:53:55 -06:00 |
|
Bryan Kowal
|
e38658e939
|
Issue #1634 - fix EDEX debug with YAJSW Wrapper
Change-Id: I7c626e2ff94cfc1c3b71dfe2f22dd69785bb2c96
Former-commit-id: 4d160993fb [formerly b05073fbe3] [formerly 4d160993fb [formerly b05073fbe3] [formerly 0d2262c0bf [formerly f2d20ea72262c5f6e7c35796606cbd4a093cece6]]]
Former-commit-id: 0d2262c0bf
Former-commit-id: f8c920c6cd [formerly 36a887416f]
Former-commit-id: ebe04d4919
|
2013-02-25 11:30:13 -06:00 |
|
Dustin Johnson
|
36b5228641
|
Merge "Issue #1620 - Fix set clean issue with job loader." into development
Former-commit-id: 79718b6a9c [formerly 83a915210d] [formerly 79718b6a9c [formerly 83a915210d] [formerly eff20112d2 [formerly a6bcea8679319fc49f59310b6731e23a00fb8554]]]
Former-commit-id: eff20112d2
Former-commit-id: b702146272 [formerly 1255b87e2e]
Former-commit-id: c67c766b34
|
2013-02-25 09:43:19 -06:00 |
|
Nate Jensen
|
55a721ecbe
|
Merge "Issue #1617 fixed vb sounding point selection for points which contain the word Point" into development
Former-commit-id: 5d7edbc0c1 [formerly b514792bbc] [formerly 5d7edbc0c1 [formerly b514792bbc] [formerly 5d828d4d62 [formerly 1fec56c55d81b35df45c2266fc234747df3791df]]]
Former-commit-id: 5d828d4d62
Former-commit-id: 3a66566610 [formerly cb37bab362]
Former-commit-id: df183bb4da
|
2013-02-25 09:31:55 -06:00 |
|
Nate Jensen
|
c0679fd504
|
Merge "Issue #1628 lower Xmx on windows in awips.product." into development
Former-commit-id: ae20ee7665 [formerly c1becf797a] [formerly ae20ee7665 [formerly c1becf797a] [formerly 545caf22fb [formerly 8525b4ac1db570160253cf7bb180914967e0b647]]]
Former-commit-id: 545caf22fb
Former-commit-id: 530d3bfa00 [formerly 87a745eb2f]
Former-commit-id: ff80c774e3
|
2013-02-25 09:31:20 -06:00 |
|
Mike Duff
|
383f5c075e
|
Issue #1552 - Implement FFMP Data Access
Peer review comments
Change-Id: Ibf11c96248972a86a6a0d779ba482cd133125b55
Former-commit-id: 8a8e8f7a73 [formerly 8bddd467b1] [formerly 8a8e8f7a73 [formerly 8bddd467b1] [formerly 81649d346a [formerly 544c90e8a0b5aba5470e60beac18d86d972c05cd]]]
Former-commit-id: 81649d346a
Former-commit-id: 01ef273417 [formerly b1a549a99f]
Former-commit-id: a92492ed07
|
2013-02-25 09:29:16 -06:00 |
|
Steve Harris
|
9da8db0212
|
13.3.1-3 baseline
Former-commit-id: a55f438dd8 [formerly 6572452887] [formerly a55f438dd8 [formerly 6572452887] [formerly 8a64f142e5 [formerly dc9e245f83eb0136157f8ca71f80f7fb9eb04796]]]
Former-commit-id: 8a64f142e5
Former-commit-id: 05eb25f124 [formerly 8d741715e3]
Former-commit-id: 1ba778753f
|
2013-02-25 10:24:53 -05:00 |
|
Steve Harris
|
a43233f8c2
|
13.3.1-2 baseline
Former-commit-id: 3e60b23072 [formerly df6d6f598e] [formerly 3e60b23072 [formerly df6d6f598e] [formerly 3d115ed3be [formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]]]
Former-commit-id: 3d115ed3be
Former-commit-id: 370ed98038 [formerly e8a51dc780]
Former-commit-id: 2a2a9e03b7
|
2013-02-25 10:18:36 -05:00 |
|