Brad Gonzales
2de2221a35
Issue #1785 Adding performance logging for bufrua, grib, obs, radar,
...
redbook, sfcobs, and satellite.
Amend: Made decoder performance logging consistent. Cleaned up other logging.
Change-Id: I1f404583240a9427cfa3dbb82f9ba3f760b3a8d4
Former-commit-id: f7debfc55f
[formerly cd39fcf122
] [formerly 8c309840a3
[formerly 871b2ceb2a6745369c1dc6e88d711e5e3a13cc37]]
Former-commit-id: 8c309840a3
Former-commit-id: 9f9248bcd9
2013-03-21 10:58:26 -05:00
Richard Peter
855dd1a664
Merge "Issue #1804 Switch all radar decompressing to be in memory. Change-Id: I4b7ce2d0280687953c434d1d1b59edb8e147b221" into omaha_13.3.1
...
Former-commit-id: 510e56c67f
[formerly d747686fa1
] [formerly bcf676f5dd
[formerly 855f05b2121c17c71d13495c9aacb12878757af6]]
Former-commit-id: bcf676f5dd
Former-commit-id: ac58a04170
2013-03-20 17:26:31 -05:00
Ben Steffensmeier
5261f1f567
Issue #1804 Switch all radar decompressing to be in memory.
...
Change-Id: I4b7ce2d0280687953c434d1d1b59edb8e147b221
Former-commit-id: ecf93b40cc
[formerly 4c3438e160
] [formerly 85b509b13e
[formerly cc5b81c2b25b00def81d2e6656a7d2c615f118c0]]
Former-commit-id: 85b509b13e
Former-commit-id: 5cb197eebd
2013-03-20 16:37:47 -05:00
Steve Harris
f4e26fd94d
Merge branch 'master_13.3.1' (13.2.1-10) into omaha_13.3.1
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: a9ced3a7ef
[formerly fa15f03e1b
] [formerly dc419068f0
[formerly c789962e3ddb094ca93415864e9f1b8ed0619ba4]]
Former-commit-id: dc419068f0
Former-commit-id: 31044eabd1
2013-03-20 16:06:20 -05:00
Steve Harris
e9f0328808
13.3.1-10 baseline
...
Former-commit-id: 57f4676b6c
[formerly 073687d9a9
] [formerly 7078eec1b1
[formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]
Former-commit-id: 7078eec1b1
Former-commit-id: 7c2e617d26
2013-03-20 15:53:01 -05:00
Richard Peter
53d8ef7ed1
Merge "Issue #1804 Remove empty data structures from radar hdf5. Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d" into omaha_13.3.1
...
Former-commit-id: d1e37c7803
[formerly 3b8e2ff0d3
] [formerly adbe7b91cc
[formerly 186e08826a1a9860bd38c5dd10465b38721218f2]]
Former-commit-id: adbe7b91cc
Former-commit-id: 3bad342dca
2013-03-20 13:32:33 -05:00
Ben Steffensmeier
1b363a547c
Issue #1804 Remove empty data structures from radar hdf5.
...
Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d
Former-commit-id: 1203b7cee4
[formerly ee7204c05c
] [formerly 82499f839d
[formerly 31528bbb403ec0fd6ee792f4451ac209fb272dcd]]
Former-commit-id: 82499f839d
Former-commit-id: 3e2a41d1d2
2013-03-20 13:26:33 -05:00
Ben Steffensmeier
b201d9dee2
Issue #1804 Switch bzip2 cots package to jbzip2.
...
Former-commit-id: 0d9119a1c7
[formerly 2b6aa86371
] [formerly ed544fc17c
[formerly d3a05862f3ff84d8ccadf3838279741ba7153adf]]
Former-commit-id: ed544fc17c
Former-commit-id: 646b61f653
2013-03-20 13:05:54 -05:00
Dave Hladky
01c6ff12a0
Issue #1782 Merge branch 'master_13.3.1' (13.3.1-9) into omaha_13.3.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
Change-Id: I86cba73da17ae0e057240abcfc2ba84b36a054bb
Former-commit-id: dc7b231bf0
[formerly 90f7f2110b
] [formerly 3cdbfa3f25
[formerly 410c1d3ca42abf207615fb6ab3e8135c6f661461]]
Former-commit-id: 3cdbfa3f25
Former-commit-id: bd17b99bd1
2013-03-20 12:41:33 -05:00
David Gillingham
a8ed519915
Issue #1447 : Update MergeVTEC.py to be current with A1 DR 21434.
...
Change-Id: Ib4a7c76f2e75df875c3cac1716a4a99019edcec9
Former-commit-id: ab6944650a
[formerly 843f474af8
] [formerly 8ea6d7227b
[formerly 54d3c1e6f1359c36ef73798ec6d3a2d24c97d31c]]
Former-commit-id: 8ea6d7227b
Former-commit-id: 5f8c8a80f8
2013-03-19 16:06:25 -05:00
Steve Harris
7e96d841d9
13.3.1-9 baseline
...
Former-commit-id: c7b2ef2d8c
[formerly 468ae82305
] [formerly f2b3fddfe2
[formerly 17276903ed005e17165649f236e6a99afa47b7fb]]
Former-commit-id: f2b3fddfe2
Former-commit-id: 0375805e79
2013-03-19 14:22:56 -05:00
Ben Steffensmeier
489a180622
Issue #1804 Cache db queries in radar decoder.
...
Change-Id: I534d70e7dc6cc704e066cba9e2307a675996e3be
Former-commit-id: 337e450f94
[formerly 7b83f6bdfa
] [formerly 5d2d834cf7
[formerly 2c8945b6ccf64f2110b7ee7057eabc9583da1efa]]
Former-commit-id: 5d2d834cf7
Former-commit-id: ff0e5696e8
2013-03-19 14:11:36 -05:00
Ben Steffensmeier
160b6a7040
Issue #1804 Remove AlphanumericValues from radar HDF5.
...
Former-commit-id: 7b7b708eee
[formerly 6c741a9ab3
] [formerly 86dffab17d
[formerly 2c8170a332994405820a25d9052afd7bc8cbcd3f]]
Former-commit-id: 86dffab17d
Former-commit-id: dfe8de96f2
2013-03-18 17:16:44 -05:00
Steve Harris
ea27f9cd17
Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1
...
Conflicts (just history comments):
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: 27c418812f
[formerly 1a999fee5a
] [formerly c18b96dc4c
[formerly 5927ff20543395733d9302eba2e6772315730a80]]
Former-commit-id: c18b96dc4c
Former-commit-id: 245afb28c8
2013-03-18 16:43:22 -05:00
Steve Harris
81a3f29afc
13.3.1-8 baseline
...
Former-commit-id: bc9df0a8f9
[formerly f97d78994b
] [formerly c15b3ffe20
[formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]
Former-commit-id: c15b3ffe20
Former-commit-id: 5f492500ea
2013-03-18 15:43:32 -05:00
Nate Jensen
4ea1508baa
Issue #1795 speed up publish by optimizing publish time updates in grid histories
...
Change-Id: I43c3f63d60832c49c6d02dab97c47d2b1f12f1c8
Former-commit-id: 30ddd909bf
[formerly e65267d5f3
] [formerly 235952a115
[formerly 788242460621edfffaf2a2c62c0c5b01da6c0e09]]
Former-commit-id: 235952a115
Former-commit-id: dad08657aa
2013-03-15 16:10:11 -05:00
Ben Steffensmeier
d22cbc7ce9
Issue #1777 fix subgridding range problems
...
Former-commit-id: 5e81f2154d
[formerly 5bd20414eb
] [formerly 0daa5817d0
[formerly bb518596c4b9ce06279e4b1e7fb841c63514ce62]]
Former-commit-id: 0daa5817d0
Former-commit-id: a6140145a4
2013-03-14 09:56:00 -05:00
Nate Jensen
15b3d5add6
Merge "Issue #1789 Move Calendar and Date parsing out of ConvertUtil and also fix date parsing." into omaha_13.3.1
...
Former-commit-id: d0db96df45
[formerly dbd2729336
] [formerly eaef235e8e
[formerly c9dc9e2a55f835e450b35cfe3408e03ab6ab8754]]
Former-commit-id: eaef235e8e
Former-commit-id: d881ab1442
2013-03-13 16:17:44 -05:00
Dave Hladky
9e97fc9efe
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
...
Former-commit-id: 765be278bb
[formerly 38b952a220
] [formerly 5dc454c7ef
[formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]
Former-commit-id: 5dc454c7ef
Former-commit-id: 160e1594b8
2013-03-13 13:56:33 -05:00
Ben Steffensmeier
a1ca2ae2d7
Issue #1789 Move Calendar and Date parsing out of ConvertUtil and also fix date parsing.
...
Former-commit-id: 51955a719a
[formerly 36b3c16a42
] [formerly ddf2092bde
[formerly 9491a90efdb389372e3ff3c988eb19aac9d508b6]]
Former-commit-id: ddf2092bde
Former-commit-id: 247c9f6c1f
2013-03-13 13:21:16 -05:00
Steve Harris
ed5f1dbab6
13.3.1-7 baseline
...
Former-commit-id: 97d2f521e4
[formerly a72254cc75
] [formerly e12ed113ae
[formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]
Former-commit-id: e12ed113ae
Former-commit-id: 31c0a97dca
2013-03-13 09:50:28 -05:00
Roger Ferrel
a9a0a471f9
Issue #1783 Modified DefaultPluginArchiveFileNameFormatter to use LinkList instead of ArrayList.
...
Change-Id: I156fc0f335320489923ae31f6e790f5e86ac26f4
Former-commit-id: f912d9ece3
[formerly c5a2786c84
] [formerly b5743e8f9b
[formerly 8ec4ac592389af736c45a11d9c6f6613fd9da504]]
Former-commit-id: b5743e8f9b
Former-commit-id: 8bb9044e3a
2013-03-12 16:58:06 -05:00
Dave Hladky
155903d135
Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227
Former-commit-id: 5c65862b8f
[formerly a1006667e0
] [formerly 4b08491880
[formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]
Former-commit-id: 4b08491880
Former-commit-id: 6ea95002de
2013-03-12 15:48:34 -05:00
Steve Harris
6fe4b16924
13.3.1-6 baseline
...
Former-commit-id: 2e110bd151
[formerly 3a4c7931e1
] [formerly 566b677d09
[formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]
Former-commit-id: 566b677d09
Former-commit-id: 4ed21b702b
2013-03-12 08:35:45 -05:00
Roger Ferrel
0deb290c24
Issue #1780 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server.
...
Code review changes 3.
Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c
Former-commit-id: 70bd9aafa7
[formerly 4deb731bd0
] [formerly b421c97d86
[formerly 225cb945e2008a56de323c7c01591ae27b3fd381]]
Former-commit-id: b421c97d86
Former-commit-id: 334f2c4a57
2013-03-11 13:00:44 -05:00
Nate Jensen
21863c5db5
Issue #1773 log publish times
...
Change-Id: I01817b8cd416dab37ff8bcb406e450d46a442a85
Former-commit-id: 5d9778a8d6
[formerly 5e3d6df7e0
] [formerly 5c59a61cef
[formerly 392feade3f36680edcdb135f7c061be172210c26]]
Former-commit-id: 5c59a61cef
Former-commit-id: d7902aba68
2013-03-07 16:49:40 -06:00
David Gillingham
94bccc87a3
Issue #1447 : Implement active table fetching, make bug fixes
...
to active table sharing from testing.
Change-Id: I84a3ed28f2cc8bdce0248faef984a4453d734c0d
Former-commit-id: 75e82d9fca
[formerly 95f8074c97
] [formerly 0a79d08dd8
[formerly cede300be734c8a05f90b9c84372866d9bd4f695]]
Former-commit-id: 0a79d08dd8
Former-commit-id: 5ad72e2a7f
2013-03-06 14:23:00 -06:00
Dustin Johnson
b88a1eefc1
Merge "Issue #1752 - Lock down user admin dialog" into omaha_13.3.1
...
Former-commit-id: 21abece1f2
[formerly d4c6c29f5f
] [formerly 3eddb2d286
[formerly 6fd60728a421630cea913d11db02b48f7940554e]]
Former-commit-id: 3eddb2d286
Former-commit-id: bfed4555a2
2013-03-05 13:32:04 -06:00
Steve Harris
b423579e4a
Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
...
Former-commit-id: 61a19a460b
[formerly 305dd72969
] [formerly 57f42761d7
[formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]
Former-commit-id: 57f42761d7
Former-commit-id: a8e1557c62
2013-03-05 12:27:49 -06:00
Mike Duff
af84910ac6
Issue #1752 - Lock down user admin dialog
...
Change-Id: I4df2626ffe24ef11b9ff7b404a884a8223d72cbb
Former-commit-id: 9d99eea617
[formerly 6809cb6f80
] [formerly 193cf1e54f
[formerly e43718de9e5b0f73e4168c724f82eb021e616a34]]
Former-commit-id: 193cf1e54f
Former-commit-id: 775a0e3edd
2013-03-05 11:26:54 -06:00
Steve Harris
a240379588
13.3.1-5 baseline
...
Former-commit-id: 8123d5ac45
[formerly a89221c75b
] [formerly e26f7eb151
[formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]
Former-commit-id: e26f7eb151
Former-commit-id: a40c9136fe
2013-03-05 10:47:06 -06:00
Steve Harris
3e0614b43a
13.3.1-4 baseline
...
Former-commit-id: d79303de13
[formerly 8c0b90f292
] [formerly 2edca90902
[formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]
Former-commit-id: 2edca90902
Former-commit-id: 5e55ded3a9
2013-03-05 10:39:59 -06:00
Richard Peter
a4bf42628a
Merge "Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw." into omaha_13.3.1
...
Former-commit-id: e74f6074e7
[formerly 070f62d08e
] [formerly 784cd2145f
[formerly 01d727795063ff365f3209f44c223c707c3942ab]]
Former-commit-id: 784cd2145f
Former-commit-id: 180540eb47
2013-03-04 17:48:05 -06:00
Dave Hladky
0f3c9ba997
Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw.
...
Change-Id: Ib8a66439ac12ed3c55a585219abc7e4200ab10b4
Former-commit-id: 22ebfe0ecb
[formerly 680317d9c4
] [formerly fc36146f48
[formerly ef45479b067655db8203f199502ea4e772a80e34]]
Former-commit-id: fc36146f48
Former-commit-id: 1260b40307
2013-03-04 17:41:11 -06:00
Steve Harris
f70ff93d2c
Issue #1744 - Revert "Issue #1744 fix deadlock"
...
This reverts commit c5600acf79
[formerly f7ffa22c7c
] [formerly f4cccabc07
] [formerly e2f12d16b7
[formerly 2a575a24e7
] [formerly f4cccabc07
[formerly 48ef00523488cdf4f65b86c5b74331f908192191]]].
Former-commit-id: 7ffb42d6e6
[formerly 28391884a7
] [formerly fcb48a7280
[formerly f7d3af09b6a0ff2c729986880531ec59f9c9e2af]]
Former-commit-id: fcb48a7280
Former-commit-id: 9e87721b85
2013-03-04 13:03:19 -06:00
Steve Harris
ee2452f5d3
Issue #1744 - Revert "Issue #1744 actually fix deadlock this time"
...
This reverts commit 348f5f0f41
[formerly 33da766f63
] [formerly 35007e0460
] [formerly 3dc69632c1
[formerly 8c84bc5fbb
] [formerly 35007e0460
[formerly 56d6dd7fb0d16ef5fdb545e816fedddb28273024]]].
Former-commit-id: 870972fb90
[formerly 88e633934d
] [formerly bba410a330
[formerly 2d7d40f23da46f1825aaeab81549ee37700670eb]]
Former-commit-id: bba410a330
Former-commit-id: 7d2286aea7
2013-03-04 13:02:32 -06:00
Nate Jensen
75366a9e5a
Merge "Issue #1731 Optimize construction of scan resource. Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b" into omaha_13.3.1
...
Former-commit-id: 6bf2eefa2a
[formerly a90a2fe857
] [formerly 677908868e
[formerly 2323a19cb44d6ff56188ed7d9062daf1fdc828fe]]
Former-commit-id: 677908868e
Former-commit-id: 216e3d6ad3
2013-03-01 13:43:50 -06:00
David Gillingham
622700dee9
Issue #1447 : Initial commit of VTEC table sharing functionality: port A1 changes to
...
VTECTableSqueeze, port requestAT/sendAT, re-port ingestAT/MergeVTEC, some minor bug fixes to
serverConfig.py, project configs.
Change-Id: Ibecb0aad913845224be1b7dd713e9fefef19d510
Former-commit-id: ca81ae4a71
[formerly 50744c1f92
] [formerly 9351f33c1c
[formerly 1e72fe30d97504f70352a181de35805a197e50f4]]
Former-commit-id: 9351f33c1c
Former-commit-id: 77a3f33fd5
2013-03-01 11:05:02 -06:00
Ben Steffensmeier
8f4c2f2a39
Issue #1731 Optimize construction of scan resource.
...
Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b
Former-commit-id: b0870c55f6
[formerly 86b9a4d8c2
] [formerly 9263ff1846
[formerly f97d09f3ee362f0f0b6155e0bb704ffd3611ca1a]]
Former-commit-id: 9263ff1846
Former-commit-id: 5a149c5dfa
2013-03-01 11:03:11 -06:00
Nate Jensen
348f5f0f41
Issue #1744 actually fix deadlock this time
...
Change-Id: I9c5468d4d7d8fe19e709bc9cce42f06ca60d3eeb
Former-commit-id: 3dc69632c1
[formerly 8c84bc5fbb
] [formerly 35007e0460
[formerly 56d6dd7fb0d16ef5fdb545e816fedddb28273024]]
Former-commit-id: 35007e0460
Former-commit-id: 33da766f63
2013-03-01 10:48:03 -06:00
Nate Jensen
c5600acf79
Issue #1744 fix deadlock
...
Change-Id: I2cff166dcdb217e0c7665deece302e5c9ac92c8f
Former-commit-id: e2f12d16b7
[formerly 2a575a24e7
] [formerly f4cccabc07
[formerly 48ef00523488cdf4f65b86c5b74331f908192191]]
Former-commit-id: f4cccabc07
Former-commit-id: f7ffa22c7c
2013-03-01 10:12:56 -06:00
Bryan Kowal
65fb00c3c3
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 44349717fb
[formerly aae64b29491d8da0001cf1182a357683546d4593]]
Former-commit-id: 44349717fb
Former-commit-id: 4f7fed259c
2013-02-27 12:46:48 -06:00
Ron Anderson
541557e0b0
Issue #1597 Code cleanup and logging improvement for GFE Performance metrics
...
Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765
Former-commit-id: d43afc8c67
[formerly bfe3c684df
] [formerly f37999b1eb
[formerly 0b4b49014598aeb94492d0b713afe17732c6e029]]
Former-commit-id: f37999b1eb
Former-commit-id: 77fbbb6a61
2013-02-26 18:44:51 -06:00
Nate Jensen
652ac25d12
Merge "Issue #1642 : Fix QPID Deadlock scenario - Address peer review comments" into development
...
Former-commit-id: a020438c99
[formerly 58957d30e5
] [formerly 24c94ef55b
[formerly 1206430bc0142b0facee03ee95e4bd5fc8c0305a]]
Former-commit-id: 24c94ef55b
Former-commit-id: b6fc51a18c
2013-02-26 18:00:50 -06:00
Richard Peter
ea806139d3
Issue #1642 : Fix QPID Deadlock scenario
...
- Address peer review comments
Change-Id: I3c52fd57f762a762d54fdce3651c7f17a8fc6462
Former-commit-id: 7d4206420c
[formerly 9a0177861f
] [formerly 5b2650599d
[formerly 2071d4f3cc54a3da43443bc71cecf038736194d8]]
Former-commit-id: 5b2650599d
Former-commit-id: 4deaf372a1
2013-02-26 16:01:25 -06:00
Dustin Johnson
94300e0c1d
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 88a9b953b6
[formerly 6ab17d82c5e4961e662acf80e26d23f3bbfaada2]]
Former-commit-id: 88a9b953b6
Former-commit-id: cc0254ba03
2013-02-26 15:06:04 -06:00
Nate Jensen
b173d34ba9
Merge "Issue #1668 add gsd pattern to allow for their plugins to be deployed" into development
...
Former-commit-id: 15c4c4dfa0
[formerly b062299796
] [formerly 36d4eff2c6
[formerly 03591924b4efdc13f1cc01182d39e280309cf381]]
Former-commit-id: 36d4eff2c6
Former-commit-id: 5c33098315
2013-02-26 13:53:40 -06:00
Matt Nash
32096feba8
Issue #1668 add gsd pattern to allow for their plugins to be deployed
...
Change-Id: Icbabbdd188557d8f6143e026e4165fc12a51a0d6
Former-commit-id: 41bbd4cf2d
[formerly a2fb0db684
] [formerly 051b36ad73
[formerly 41c12ff165a6f90edc1cd78aed0ae0053d137bb2]]
Former-commit-id: 051b36ad73
Former-commit-id: b1fe380c44
2013-02-26 13:29:04 -06:00
Dustin Johnson
219e882fc5
Issue #1643 Add NCF bandwidth manager router
...
Change-Id: I226bf657469eccc68c29cb21dac10cc10e562ca8
Former-commit-id: ebf02481f0
[formerly d58d28c636
] [formerly 722e41b8b0
[formerly 2b52368c81272df18f3af1334057295d11bb4b52]]
Former-commit-id: 722e41b8b0
Former-commit-id: cf86c92fad
2013-02-26 11:32:03 -06:00
Steve Harris
901cbbf56d
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 e8135b9c14
[formerly 2506058a672fce230e445bcc5bf8ae2f52df0766]]
Former-commit-id: e8135b9c14
Former-commit-id: 2398ef1e85
2013-02-25 16:05:22 -06:00