Steve Harris
|
3e63f280a2
|
13.1.2-6 baseline
Former-commit-id: 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]]
Former-commit-id: 59969775ad
Former-commit-id: fe763963e9 [formerly 82a1ed77a4] [formerly fa884fbcd584330564fea44a1538e11036e753a8 [formerly dbcae57f57]]
Former-commit-id: 385d5b42196eb703cc60637c47506c02c454b5fc [formerly 05bdc0ecd2]
Former-commit-id: b7f180d9d3
|
2013-01-06 14:55:11 -06:00 |
|
Steve Harris
|
745f2c6409
|
13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 82cdde8491 [formerly cd4185ef5c] [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]]
Former-commit-id: c69e1900269e630aefc061c2464bc8fea1c9776a [formerly b6fa9b4858]
Former-commit-id: f52ec0b0a0
|
2013-01-06 14:32:24 -06:00 |
|
Ron Anderson
|
c62c47db45
|
Issue #1395 Updated SetOpacityDialog. Added source jars for geoapi. Removed legacy shapefile import menu item.
Change-Id: I495db377f77485fd9bd896f02dba9c640b9ad3b1
Former-commit-id: e5c1e61664 [formerly 3e4aeeab8b] [formerly 753fa0487b] [formerly e5c1e61664 [formerly 3e4aeeab8b] [formerly 753fa0487b] [formerly 639b5abbd9 [formerly 753fa0487b [formerly a7657cf6b42a3d7a0f5fd64468820d1547ad1e9d]]]]
Former-commit-id: 639b5abbd9
Former-commit-id: 3ef1648013 [formerly 8b81f0bfb4] [formerly 268b50c70033e4dcada30393facee318b4eee737 [formerly 995f28220a]]
Former-commit-id: 478c9f69d24b78dec665e13375c109ca93983718 [formerly 676819adfa]
Former-commit-id: c341ac0f55
|
2012-12-13 15:25:24 -06:00 |
|
Ron Anderson
|
7e0d1195da
|
Issue #1393 Add additional jars to org.geotools
Change-Id: I10aaef928d2eb7333d3d65c3871b633d5760e14f
Former-commit-id: 3b29368389 [formerly 30c396680c] [formerly 95696f6396] [formerly 3b29368389 [formerly 30c396680c] [formerly 95696f6396] [formerly 7cd3b46dfd [formerly 95696f6396 [formerly 910af88ea60686f094bb3de17f5412cb9656111f]]]]
Former-commit-id: 7cd3b46dfd
Former-commit-id: 8ac9be23c6 [formerly 87f3e0f015] [formerly aac2fc71ff06ed900732b4fedab93a2fbd417eab [formerly a96fa17142]]
Former-commit-id: 8bbeec3c85599cd933b7f35f6e0dee5ed2c15dc5 [formerly 010c54b239]
Former-commit-id: 04dc7bc022
|
2012-12-06 14:17:35 -06:00 |
|
Matt Nash
|
6b907be8c9
|
Issue #1369 fix geotiff import in CAVE
Change-Id: Iccc051478064e5746c80be5cf8edad7eb8e89f50
Former-commit-id: b591c681fb [formerly cb9cd97d1f] [formerly fc4d7daab4] [formerly b591c681fb [formerly cb9cd97d1f] [formerly fc4d7daab4] [formerly 10d399aafe [formerly fc4d7daab4 [formerly ab5775f5187c2b0a2180dfeebc32774c3a1adb16]]]]
Former-commit-id: 10d399aafe
Former-commit-id: d5654048bd [formerly 01dc19b06d] [formerly 919796c9928b099579e5d3474a4ef09ebcf528d6 [formerly c9372636d9]]
Former-commit-id: 8169e8edbe656bfd9d3be0b23d6119b2f699421a [formerly dc7355a3e4]
Former-commit-id: 2a207511e4
|
2012-12-06 12:02:11 -06:00 |
|
Nate Jensen
|
473c368786
|
Merge "Issue #1325 add missing sourcepath for jts" into development
Former-commit-id: 1e1049386d [formerly 397c71cb00] [formerly 19d74235d9] [formerly 1e1049386d [formerly 397c71cb00] [formerly 19d74235d9] [formerly c4e1d26056 [formerly 19d74235d9 [formerly ecff6dc0484b6dc65e2c043be4a2b6a7fbb3a503]]]]
Former-commit-id: c4e1d26056
Former-commit-id: 4475544f1a [formerly 72a741c6a3] [formerly 2a500d5ac4d21be7fe96c6af1e73df54c1aa995e [formerly 84e98e2364]]
Former-commit-id: 073a2033994835edea92a0e233ef779691604007 [formerly e76a412fb4]
Former-commit-id: cabeee008a
|
2012-11-15 11:02:35 -06:00 |
|
Ron Anderson
|
0314a1e4c3
|
Issue #1325 add missing sourcepath for jts
Change-Id: I776bcb3cbb2accd0cf6c41b2a91c12102b9a9653
Former-commit-id: f3ee84c21e [formerly 0984f201b2] [formerly 94ec6eaeaf] [formerly f3ee84c21e [formerly 0984f201b2] [formerly 94ec6eaeaf] [formerly 457d55ecdf [formerly 94ec6eaeaf [formerly bf8dd91d2e2cb79548cc852c82446cb914e63991]]]]
Former-commit-id: 457d55ecdf
Former-commit-id: f45b7720e1 [formerly 9d832ad8be] [formerly 0a5977386395099b02d8f8518f5295e0e06d0602 [formerly 1157e5a55e]]
Former-commit-id: c14adb26b07a5e1a6cce2422a3ce311966ce9431 [formerly c55588f57c]
Former-commit-id: 7a9826a27f
|
2012-11-15 11:00:02 -06:00 |
|
Dustin Johnson
|
f4fc1060be
|
Issue #1322 Common baseline changes to support BandwidthManager
Amend:
Revert EDEXLocalizationAdapter and duplicate getPath() in test version.
Change-Id: I72205aadeba1f894ee49cb4d146519df10d941f8
Former-commit-id: f1cfa9a60d [formerly afd9a767ea] [formerly 7d9e7567bd] [formerly f1cfa9a60d [formerly afd9a767ea] [formerly 7d9e7567bd] [formerly 7c59f9ea41 [formerly 7d9e7567bd [formerly 07aeec469a83ce07286bc27ea3e6bda41909be8d]]]]
Former-commit-id: 7c59f9ea41
Former-commit-id: 21dc859b85 [formerly 5d410ff934] [formerly caae98dd9803817a99d22d4cbbe38eccdaeff2f9 [formerly c0c60c2488]]
Former-commit-id: 0453e709fd374f851f35d3dfd273d46e8e3bbc65 [formerly 3129d3bd3a]
Former-commit-id: 0c5a52f3b1
|
2012-11-14 12:19:10 -06:00 |
|
Ron Anderson
|
ae896a9da2
|
Issue #1325 Update geotools source path entries per code review.
Change-Id: Ib9a682df979cd1b20510880b594f5c2e496094b0
Former-commit-id: dbc5a5bb97 [formerly 1bb7258935] [formerly 8a5a2dc532] [formerly dbc5a5bb97 [formerly 1bb7258935] [formerly 8a5a2dc532] [formerly 795dfdc9dd [formerly 8a5a2dc532 [formerly fc0837f4b3219eaa7ae4a99dee6db1da9a80c3ba]]]]
Former-commit-id: 795dfdc9dd
Former-commit-id: 88e7d313c4 [formerly d6a33fb39f] [formerly 20e198ff53cca6785546ec870a4e207bdb8ddfbc [formerly bad09a9c0d]]
Former-commit-id: 3b9d5c03dba338511c7106110cef946f3ebdfc75 [formerly dc6b83dccc]
Former-commit-id: 6bf06bf78f
|
2012-11-13 12:06:54 -06:00 |
|
Ron Anderson
|
d2d6f87ea4
|
Issue #1325 Update GeoTools for WA4.7
Change-Id: Ic4a5b2ba0e6567d39c7faf19ed4a5d5b5445fb94
Former-commit-id: e7cd1f9def [formerly 7aaf4db2dc] [formerly f709ab812a] [formerly e7cd1f9def [formerly 7aaf4db2dc] [formerly f709ab812a] [formerly 303994ff1b [formerly f709ab812a [formerly 5700f31e4620e1f7b819386aa8762927ec94c2d7]]]]
Former-commit-id: 303994ff1b
Former-commit-id: 366df432bc [formerly 3ae270a65d] [formerly eb6052e7b3aef0480bd8fd7500f4d915b645104c [formerly 7bf1316e8c]]
Former-commit-id: 99d7658e5a1037952c27cb188299ce2c75c3e4ee [formerly 80a6ade49c]
Former-commit-id: 46bedc0009
|
2012-11-12 15:02:08 -06:00 |
|
Dustin Johnson
|
63240a4ec5
|
Issue #1302 Restore jdom.jar, delete net.jcip/.project
Amend:
Also change the manifest and .classpath for ohd common
Change-Id: I26b4e88d36da6c38da393f2428b79735c881a23b
Former-commit-id: 19c2e301b8 [formerly db4d728eb7] [formerly 595c421e47] [formerly 19c2e301b8 [formerly db4d728eb7] [formerly 595c421e47] [formerly 2b6e98954e [formerly 595c421e47 [formerly 49b999039c470a5df095a202b5a67bf036a5b71c]]]]
Former-commit-id: 2b6e98954e
Former-commit-id: 272761ae41 [formerly eac5bc8197] [formerly 3fe0762a484ee2e5830878352f009474c977d9f7 [formerly 0806be04dd]]
Former-commit-id: 8e66108e274790c8749fcb207ab943f1083f8acf [formerly 1317e0b3ef]
Former-commit-id: f9c6566ba7
|
2012-11-08 14:47:17 -06:00 |
|
Dustin Johnson
|
eb82c7672b
|
Issue #1302 Address peer review comments for 5-Data_Delivery/development merge
Amend:
More peer review comments
Restore PreferencesHandler
Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7
Former-commit-id: acd4cf94d8 [formerly efd3d3735a] [formerly 064ef82d1e] [formerly acd4cf94d8 [formerly efd3d3735a] [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]]
Former-commit-id: 1dbeb22893
Former-commit-id: cd5faf58bf [formerly 2d1e886cf3] [formerly 6b7958c5dca22552e39ad9f77a0bdd977908f9dc [formerly 4222b24d09]]
Former-commit-id: 58274565203c021076e001f24f089a98cd2216f6 [formerly 6613c51d3b]
Former-commit-id: b4a13190ad
|
2012-11-08 09:57:16 -06:00 |
|
Max Schenkelberg
|
3a1cefc612
|
Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration.
Change-Id: If392126da6b7b27be20bbcb2423ab0e851307345
Former-commit-id: 94e64c9b0d [formerly f069f34a96] [formerly 2f90120248] [formerly 94e64c9b0d [formerly f069f34a96] [formerly 2f90120248] [formerly ca4177dd08 [formerly 2f90120248 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]]]
Former-commit-id: ca4177dd08
Former-commit-id: f9e6347863 [formerly 5a5bd522a1] [formerly 42f60026840ae4bf86371ebfd3e40ca565028c4b [formerly 747ab974e9]]
Former-commit-id: 0f95dc114844e36c224300902fd5c26ef83108c0 [formerly 50625b0453]
Former-commit-id: 2345861756
|
2012-11-07 10:44:42 -06:00 |
|
Dustin Johnson
|
42b6933141
|
Issue #1302 Fixes for data delivery merge with development branch.
Change-Id: Ibff04f82290ff0b417b3fd8d1892925241aec753
Former-commit-id: a03d79bbf0 [formerly 8d5c86f31e] [formerly 2f28e19bf6] [formerly a03d79bbf0 [formerly 8d5c86f31e] [formerly 2f28e19bf6] [formerly a8f9c4f90a [formerly 2f28e19bf6 [formerly 87641d4b41b10f66e12c8d839548b8012e900438]]]]
Former-commit-id: a8f9c4f90a
Former-commit-id: feb6c540b8 [formerly 7b4967b5bb] [formerly 8eeb213e5becb7f3d249c38ca4c6b67ae70efd03 [formerly 7f994472ae]]
Former-commit-id: 1573ccd4bca30af5c08df435bccce6502732d849 [formerly e0c68bde6d]
Former-commit-id: 7843e33544
|
2012-11-01 16:31:14 -05:00 |
|
Dustin Johnson
|
4bc4d95b21
|
Issue #1302 Merge branch '5-Data_Delivery' into development
Conflicts:
edexOsgi/build.edex/deploy-common/external-rules.xml
edexOsgi/build.edex/deploy-common/plugin-methods.xml
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0
Former-commit-id: 7d0e4a6e75 [formerly 8e69107b5a] [formerly 98d7beae50] [formerly 7d0e4a6e75 [formerly 8e69107b5a] [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]]
Former-commit-id: 31d7d09c10
Former-commit-id: fe8a2a3b09 [formerly e7a0f96a9a] [formerly 465044dd2793505eba62cb46e6b3a8ac48623765 [formerly bcf575966b]]
Former-commit-id: df421cc2225941d22d1932b1c7a86fb3bdad68ce [formerly 4d9c945388]
Former-commit-id: 931d94d1de
|
2012-11-01 13:36:06 -05:00 |
|
Steve Harris
|
8794e3b599
|
12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]]
Former-commit-id: 6958b861f0
Former-commit-id: c9b563338a [formerly 2c82d9cb07] [formerly d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]]
Former-commit-id: 892afd7b093bec93e8f4c170f6b8ae08bea40239 [formerly 560f0d9cc3]
Former-commit-id: 35e34308c5
|
2012-10-16 13:27:07 -05:00 |
|
Steven Harris
|
db663faca9
|
12.11.1-1 baseline
Former-commit-id: ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly feec28f274 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]]
Former-commit-id: feec28f274
Former-commit-id: 9c67bbab77 [formerly f5e63d5f93] [formerly 5951ea0cd95d43633ba501132c7b65a55db27e09 [formerly 8843ffd022]]
Former-commit-id: d6911f5473d9aadbb4a4b9d3389106feb8c83693 [formerly a544be6d83]
Former-commit-id: 2f855322f6
|
2012-09-27 15:57:45 -05:00 |
|
Steve Harris
|
9d4e230e7a
|
12.10.1-3 baseline
Former-commit-id: 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: 64699fa90b [formerly f376a4b4db] [formerly fcb66f8bc7809d9eb8a7989d2e1acbdbe19fb78e [formerly 438d139fdd]]
Former-commit-id: 477c548d5650883749d49288002c87221b218db7 [formerly faadb51529]
Former-commit-id: 5030894212
|
2012-09-11 16:00:38 -05:00 |
|
Steve Harris
|
cba4faf995
|
12.9.1-10 baseline
Former-commit-id: 264d870cbf [formerly bdb45cdfae] [formerly 3adc50a783] [formerly 264d870cbf [formerly bdb45cdfae] [formerly 3adc50a783] [formerly cb9b80f3a0 [formerly 3adc50a783 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]]]
Former-commit-id: cb9b80f3a0
Former-commit-id: c704490769 [formerly f43a5af47f] [formerly eed64ebc552063bbc01aefdaa691a9c27ae700c3 [formerly dc08c5a71a]]
Former-commit-id: 8b8bb30a759783a20d278f5fb0049d2db76cb8dc [formerly 5bb474d33c]
Former-commit-id: ede38c4b3f
|
2012-08-30 14:28:27 -05:00 |
|
Steve Harris
|
98059f9ef1
|
12.9.1-5 baseline
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]]
Former-commit-id: f2fac39428
Former-commit-id: d9faed979f [formerly 7fb0b17bd5] [formerly 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]]
Former-commit-id: 84e9e52a92ae5e740b0daf680a98316f7435f7f7 [formerly 9b5c2094ed]
Former-commit-id: 2d928d328e
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
c74431ba29
|
12.6.1-9 baseline
Former-commit-id: 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]]
Former-commit-id: 27afa60345
Former-commit-id: e528bb0df2 [formerly dc50bc8443] [formerly 39c28d347eb5aeecbc48481fe6871268a89c0c2d [formerly 4f7bb90bb0]]
Former-commit-id: 38b944b7b39fc0e1e6c5f5e0171cfa20b64068e4 [formerly d5fa61041b]
Former-commit-id: 37f2b6e138
|
2012-07-10 07:53:49 -05:00 |
|
Steve Harris
|
46068c6716
|
12.5.1-15 baseline
Former-commit-id: 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 1f521a70b3 [formerly 97c4db937e] [formerly 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f]]
Former-commit-id: 5dd364497cd5da1357297a4b842e962ad3d5e006 [formerly 9054c5ab6c]
Former-commit-id: 39ff9954f8
|
2012-06-08 13:39:48 -05:00 |
|
Steve Harris
|
7f90924706
|
12.4.1-10 baseline
Former-commit-id: 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 40aa780b3d [formerly 33a67cdd82] [formerly 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5]]
Former-commit-id: a16a1b4dd44fc344ee709abbe262aeed58a8339b [formerly e5543a0e86]
Former-commit-id: 0c25458510
|
2012-05-01 18:06:13 -05:00 |
|
Steve Harris
|
5b35d8a6e0
|
12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188 [formerly a2a6a18fae] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c]
Former-commit-id: 74b66d9683
|
2012-04-18 15:18:16 -05:00 |
|
Steve Harris
|
fab0e2ccd5
|
Merge branch 'ss_sync' into 4-Thin_Client
Former-commit-id: 55b44a00db [formerly 608a0c17a0] [formerly f9baa1c98c] [formerly 55b44a00db [formerly 608a0c17a0] [formerly f9baa1c98c] [formerly 46e1499e43 [formerly f9baa1c98c [formerly 2059372e90437312cf12f06de6c84d0824fb586c]]]]
Former-commit-id: 46e1499e43
Former-commit-id: 1fa3e31716 [formerly 63764220c4] [formerly 4963e367347650292e79807030506ea282547db3 [formerly 096ba6eb30]]
Former-commit-id: 72d2a2722e035133e9f491f4cc02223a9f5a00ab [formerly 1328771113]
Former-commit-id: 034270857e
|
2012-02-23 13:16:35 -06:00 |
|
Steve Harris
|
3c8ac339bb
|
removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore
Former-commit-id: 2f8260ccbc [formerly 07ac42866c] [formerly c502603907] [formerly 2f8260ccbc [formerly 07ac42866c] [formerly c502603907] [formerly ecb38ba165 [formerly c502603907 [formerly cccea1aa13ad987a8c1f2b06c2dfcaa77967544d]]]]
Former-commit-id: ecb38ba165
Former-commit-id: 9397ca10a8 [formerly d83100c3df] [formerly 7430208f5d1e69b088b0ad09205b10f1007182e4 [formerly a9b900821a]]
Former-commit-id: 45ca1834b3349431a2e9329f63d92b5396d451f6 [formerly 32fa2a28c5]
Former-commit-id: 3433a1e31c
|
2012-02-23 12:45:50 -06:00 |
|
Steve Harris
|
43ff909553
|
Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
deleted 'H5U; PlotResource2.java was not edited
Former-commit-id: 5a96582f16 [formerly 92084b3f20] [formerly d0bbbfefcc] [formerly 5a96582f16 [formerly 92084b3f20] [formerly d0bbbfefcc] [formerly 7a10ca9766 [formerly d0bbbfefcc [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]]]
Former-commit-id: 7a10ca9766
Former-commit-id: 2d02f819be [formerly 92b7072b82] [formerly 6fb9d83319d58ea511061243437d2805a4c4ae7b [formerly 3d511fe719]]
Former-commit-id: 91921bfe8a96f90874dbc2e55763bb94f1fea024 [formerly ae9c52b012]
Former-commit-id: 3aef320ffd
|
2012-02-23 10:06:18 -06:00 |
|
Roger Ferrel
|
c42448a8d5
|
Issue #181
Changes from January ncep_cave
Former-commit-id: aa10b2f656 [formerly ae0981ac0f] [formerly 7427aeaf29] [formerly aa10b2f656 [formerly ae0981ac0f] [formerly 7427aeaf29] [formerly fa42f2dc60 [formerly 7427aeaf29 [formerly 6a878c3c5f400c53d39d7920c0619362aaafb946]]]]
Former-commit-id: fa42f2dc60
Former-commit-id: 38f1182c6e [formerly 9475b22c54] [formerly f688e047f0ccf0adc31f824c5e1224b8d1c1598b [formerly 376f6868b6]]
Former-commit-id: 16e6613039d30140d16a08ef42c054c08fe5a737 [formerly 0d2ef82d19]
Former-commit-id: 80b5a2049b
|
2012-01-26 09:26:07 -06:00 |
|
Bryan Kowal
|
819b77d5d0
|
Issue #24 - merging jep changes into git thinclient branch.
Former-commit-id: c1d930b119 [formerly be0b6a87eb] [formerly 5039d66b12] [formerly c1d930b119 [formerly be0b6a87eb] [formerly 5039d66b12] [formerly cf4d56d0a0 [formerly 5039d66b12 [formerly 89f42f2933110db2f8ae8ffb299a4de5fa3b87ac]]]]
Former-commit-id: cf4d56d0a0
Former-commit-id: 3bc50618b7 [formerly f6b08149ad] [formerly 04447b381e8f34176bf56aeac8375d7e5d6866ba [formerly 90c33ef882]]
Former-commit-id: 5deeaa5352ab19e9521a87ced725f98ed250df11 [formerly a5a50ccfe0]
Former-commit-id: f0cdfeb9a8
|
2012-01-23 13:25:11 -06:00 |
|
Bryan Kowal
|
5609d47b35
|
Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
Former-commit-id: 28957b7118 [formerly 971bf802ac] [formerly 2142afe3f1] [formerly 28957b7118 [formerly 971bf802ac] [formerly 2142afe3f1] [formerly 2b5ee4b940 [formerly 2142afe3f1 [formerly 296d2915b17f0086d93e200d4780663bff34edbb]]]]
Former-commit-id: 2b5ee4b940
Former-commit-id: 4c4fc64253 [formerly a1dbdff475] [formerly e24d39003e4489633c8f3c358cda877ba7831b9e [formerly 2a7b92ec91]]
Former-commit-id: 9e6a3f061015a2573aab1ed70eb6bcd887a1fb1a [formerly 3bcecdfe66]
Former-commit-id: 7afea63245
|
2012-01-20 11:37:38 -06:00 |
|
Matt Nash
|
515196cb86
|
Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]
Former-commit-id: c83e5ff474
Former-commit-id: fa4cd88c90 [formerly 82300ccdcf] [formerly 21d2361f00 [formerly 1faae42484]]
Former-commit-id: 21d2361f00
Former-commit-id: bcc32c10bc
|
2012-01-19 11:53:12 -06:00 |
|
root
|
7dbd17a5aa
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf [formerly 8e80217e59] [formerly 377dcd10b9 [formerly 3360eb6c5f]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
|
2012-01-06 08:55:05 -06:00 |
|