Steve Harris
|
2dd9ca8a3b
|
13.5.1.1-3 baseline
Former-commit-id: 265a5590e8 [formerly a4bb855c1f] [formerly 1f4c8f317f] [formerly 06694a32ce [formerly 1f4c8f317f [formerly 5f5672a32c95941d8a75d55dc99859f1f9585167]]]
Former-commit-id: 06694a32ce
Former-commit-id: f13d7e2356ec3c932f6677d1ad5f0531e834f27c [formerly 62643f0d21]
Former-commit-id: d5b52526dd
|
2013-09-23 10:16:44 -04:00 |
|
Steve Harris
|
929b982f24
|
13.5.1.1-2 baseline
Former-commit-id: a5504150bc [formerly db270db3cb] [formerly 4fa273439f] [formerly e19db57fe6 [formerly 4fa273439f [formerly 9638b9e92c2d271cb804d32daba114c063aeb7f5]]]
Former-commit-id: e19db57fe6
Former-commit-id: a85392fb47e1e594c8076e87e78451ace76cb77a [formerly 11369e2753]
Former-commit-id: 41d7784ee6
|
2013-09-16 10:02:04 -04:00 |
|
Steve Harris
|
69b7e120f4
|
13.5.1.1-1 baseline
Former-commit-id: dcaa4767f3 [formerly b1fb0f9236] [formerly 5b0cd7cbcc] [formerly d2217643ff [formerly 5b0cd7cbcc [formerly 6ccc6d533c57302d87b49920a236f9f033c90c14]]]
Former-commit-id: d2217643ff
Former-commit-id: 5d27b520bcecd57bdae31ab83acb368b1f9c3141 [formerly 54e7186749]
Former-commit-id: 3ed8000ce1
|
2013-09-12 11:03:55 -04:00 |
|
Steve Harris
|
e7f1079d23
|
13.5.1-20 baseline
Former-commit-id: bbd58fce53 [formerly fb4173d5dd] [formerly a60b097050] [formerly 5f2a2434a6 [formerly a60b097050 [formerly 6ae21523e354f26dbf0a668239b75e9b679bbf1f]]]
Former-commit-id: 5f2a2434a6
Former-commit-id: e9404c23774ef105a8b0951164d0c19a69b16c4d [formerly b99b6cf244]
Former-commit-id: 0278f189a9
|
2013-09-03 09:58:18 -04:00 |
|
Steve Harris
|
bdaa93824d
|
13.5.1-19 baseline
Former-commit-id: 12f85e6c92 [formerly d50a0f64c9] [formerly 5b643065e9] [formerly 3b296a33b0 [formerly 5b643065e9 [formerly f3acac4ea9a285e64104a55db5b76593147c15e4]]]
Former-commit-id: 3b296a33b0
Former-commit-id: 75009c0b37042f112b88cfc51b0c3d9555c67908 [formerly 3e27b2be1d]
Former-commit-id: edad929d6a
|
2013-09-03 09:48:08 -04:00 |
|
Steve Harris
|
ff31991527
|
13.5.1-18 baseline
Former-commit-id: 80d8236464 [formerly d931b80e70] [formerly afb34814dd] [formerly 0a7acf96c7 [formerly afb34814dd [formerly f407ad6db2f621a5be95939aea88f49d874d1ab6]]]
Former-commit-id: 0a7acf96c7
Former-commit-id: bef853d6001eb232a3c91986195c4ab5e86bc9cd [formerly 2f9aa87a9f]
Former-commit-id: 261b1da9d6
|
2013-08-22 09:12:43 -04:00 |
|
Steve Harris
|
4fd4093539
|
13.5.1-17 baseline
Former-commit-id: fb9ab08255 [formerly 2d882ccb54] [formerly 9dd7dc5d20] [formerly b210c90245 [formerly 9dd7dc5d20 [formerly c5d75a6473b2659b9ac1054a1160c921bd8c1c16]]]
Former-commit-id: b210c90245
Former-commit-id: c4d2af6f3a1f86a3300795dc1db7d6c9323eac0b [formerly a192a3ebb1]
Former-commit-id: 7c0cf13ea8
|
2013-08-19 16:34:24 -04:00 |
|
Steve Harris
|
ca5796e082
|
13.5.1-16 baseline
Former-commit-id: 47130c98a5 [formerly 6818d80085] [formerly 34ed84336297f15bcf09076786d608ada5df2472 [formerly cd3b63d961]] [formerly 7ce0234d76 [formerly cd3b63d961 [formerly 2fcbcde58066c18ab423c94c37f446ab5e7f42da]]]
Former-commit-id: 7ce0234d76
Former-commit-id: 0cee24c9ec1cc1b51da8edf9a2cdeef3b66498e1 [formerly d7b1ed4900]
Former-commit-id: e881ff6271
|
2013-08-15 13:40:37 -04:00 |
|
Steve Harris
|
6f1b6d494f
|
13.5.1-15 baseline
Former-commit-id: b05abcaec0 [formerly 535218c676] [formerly 53e96e21db] [formerly c6dc1817e7 [formerly 53e96e21db [formerly dbf9107f9c775f9a1df759bc341c0722f5fc92f2]]]
Former-commit-id: c6dc1817e7
Former-commit-id: c5d936eabd4d2eeade071aad734eb9b268940a49 [formerly 65beefde58]
Former-commit-id: 4f9288e7c1
|
2013-08-14 10:24:26 -04:00 |
|
Steve Harris
|
4e75333155
|
13.5.1-14 baseline
Former-commit-id: c6465a3398 [formerly b848317203] [formerly d695e5debe] [formerly 80e5f7fbd4 [formerly d695e5debe [formerly fe7b1a704ee92b34684e4f9059bd61cfa28dd485]]]
Former-commit-id: 80e5f7fbd4
Former-commit-id: 979d519294a0cce041889e9000a739088fbe1b71 [formerly cd5b1e9e2f]
Former-commit-id: 9bd983e2fe
|
2013-08-14 10:07:41 -04:00 |
|
Greg Armendariz
|
076a0b08ac
|
13.5.1-13 baseline
Former-commit-id: 429898edc6 [formerly f0b62a22bf] [formerly 29b823fee4] [formerly 5577e686c1 [formerly 29b823fee4 [formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]]]
Former-commit-id: 5577e686c1
Former-commit-id: 12247e45609042e5a8e46278311d4b5b7ec9eb9d [formerly 8bfac41add]
Former-commit-id: 9f2f62427b
|
2013-08-08 17:00:36 -04:00 |
|
Greg Armendariz
|
75d1e77f1b
|
13.5.1-12 baseline
Former-commit-id: 34e0218b59 [formerly 01d067cff9] [formerly c9898ba8d1] [formerly fe51885ba7 [formerly c9898ba8d1 [formerly eb9cd610891ce5830f4a169db036a49f32c1e63b]]]
Former-commit-id: fe51885ba7
Former-commit-id: cdf25117bf69e350e12772219b241d184999c14d [formerly 9892a1a262]
Former-commit-id: f777a744e5
|
2013-08-08 15:34:01 -04:00 |
|
Greg Armendariz
|
4c20fc4977
|
13.5.1-11 baseline
Former-commit-id: 814f7fdcdd [formerly c402dbf6e9] [formerly ea7b22500e] [formerly 4ec04083bd [formerly ea7b22500e [formerly 7142e607157f6d6ac1ba5cb24f3b3dbf9ab75f7f]]]
Former-commit-id: 4ec04083bd
Former-commit-id: f2fc00d3a51154c96e69230aaba5d4ce07cccb09 [formerly 26e58d8cdb]
Former-commit-id: 75f9f8df3f
|
2013-08-07 14:34:27 -04:00 |
|
Greg Armendariz
|
690ea2e228
|
13.5.1-10 baseline
Former-commit-id: 9694f9390a [formerly e276b0fabe] [formerly 852455843f] [formerly acf7ced37b [formerly 852455843f [formerly c2c6882c462c34ce9cb9ea3399071c2a121ba0f7]]]
Former-commit-id: acf7ced37b
Former-commit-id: 55e2845c864335ebeda69be5a21e4f9deaffd22e [formerly 05282eac88]
Former-commit-id: 9ddb32967c
|
2013-08-07 14:14:46 -04:00 |
|
Steve Harris
|
7fc384a659
|
13.5.1-9 baseline
Former-commit-id: 1be9abc02f [formerly 778df21de9] [formerly 97fe6a670f] [formerly 6e60cd9a79 [formerly 97fe6a670f [formerly 06a1dd45adedbe259f9c30ebf93f2f90017fe945]]]
Former-commit-id: 6e60cd9a79
Former-commit-id: 1facde304923c944b67d09bf0537810759f82aa7 [formerly bbb7f1dd49]
Former-commit-id: c7e7c838aa
|
2013-08-01 09:20:23 -04:00 |
|
Steve Harris
|
340e7bab60
|
13.5.1-8 baseline
Former-commit-id: 52da6c54db [formerly 392faf86e7] [formerly 3bece5e5d0] [formerly dfbf9a5afe [formerly 3bece5e5d0 [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]]
Former-commit-id: dfbf9a5afe
Former-commit-id: 045a10d1b22e942768c319f31dc18646c3419092 [formerly 2afb46f814]
Former-commit-id: a7d4c6274e
|
2013-07-26 09:02:34 -04:00 |
|
Steve Harris
|
0fe8173b7b
|
13.5.1-7 baseline
Former-commit-id: 67299457b1 [formerly 630705aa3f] [formerly bf58a81b38] [formerly 86ce1248c2 [formerly bf58a81b38 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]
Former-commit-id: 86ce1248c2
Former-commit-id: 5aea78fbd5da8a55b6f4dc4542505312f878d73d [formerly f9c9aecba5]
Former-commit-id: cb50a0028d
|
2013-07-18 12:07:22 -04:00 |
|
Greg Armendariz
|
f23d42e977
|
13.5.1-6 baseline
Former-commit-id: e375a74bc8 [formerly 5894853996] [formerly 7e09fa5a0b] [formerly b9044b1195 [formerly 7e09fa5a0b [formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]]
Former-commit-id: b9044b1195
Former-commit-id: 760e0f04ffe2e9d265f85e7c8b4777777bcf64d5 [formerly 12a09f9aa7]
Former-commit-id: 93b71934c0
|
2013-07-10 10:04:22 -04:00 |
|
Greg Armendariz
|
d5bea0fc06
|
13.5.1-5 baseline
Former-commit-id: ed9da994c7 [formerly 82aabf1066] [formerly 492f92ef7b] [formerly ea7ac37930 [formerly 492f92ef7b [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]]
Former-commit-id: ea7ac37930
Former-commit-id: 95bf0ef285bd2b4a9686028c226e04cf2a86cfe7 [formerly 869922cb82]
Former-commit-id: d899faec3d
|
2013-07-03 12:20:27 -04:00 |
|
Steve Harris
|
43bb696901
|
13.5.1-4 baseline
Former-commit-id: 2487a8b435 [formerly c56be8a332] [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]
Former-commit-id: e197f23ce3
Former-commit-id: 3369892ae14fdcfd7af44c724a72588adeb9f95b [formerly f658320357]
Former-commit-id: 640b022e84
|
2013-06-28 09:46:25 -04:00 |
|
Steve Harris
|
e1a5587dd0
|
13.5.1-3 baseline
Former-commit-id: a0ff6c20ea [formerly d8176d4a4c] [formerly 63803c1424] [formerly 72d22a30c9 [formerly 63803c1424 [formerly cc90f0c02410fef504ec9de389c07dfa41164247]]]
Former-commit-id: 72d22a30c9
Former-commit-id: d0cb0ee5e39989d9bf546dcfaef136a80153b511 [formerly 810388f00a]
Former-commit-id: deebdb874a
|
2013-06-24 09:29:43 -04:00 |
|
Steve Harris
|
0f83e19dab
|
13.5.1-2 baseline
Former-commit-id: 7fe15db2f8 [formerly bc60b22f00] [formerly adb779323d] [formerly 3386330894 [formerly adb779323d [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]]
Former-commit-id: 3386330894
Former-commit-id: ba43c81d4e5345330a6dab60b2a537923dc72f9e [formerly 3926dc20f7]
Former-commit-id: ccd66c0724
|
2013-06-17 15:01:22 -04:00 |
|
Steve Harris
|
43b7a9b410
|
13.5.1-1 baseline
Former-commit-id: 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 7fa801e313a1348e6bb00da11f43928fdf179b69 [formerly 30ba1d634e]
Former-commit-id: 0aab285b8a
|
2013-06-10 15:17:17 -04:00 |
|
Steve Harris
|
7a0905578d
|
Merge branch 'master_13.4.1' into master_13.5.1
Conflicts (solved by taking all of 13.4.1-14):
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIState.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
rpms/awips2.core/Installer.ldm/component.spec
rpms/build/i386/build.sh
Former-commit-id: cdb89b5d29 [formerly bb6628c17f] [formerly b0e5c758dc] [formerly 2fc7f80939 [formerly b0e5c758dc [formerly 388fb201c6914d9ec7986a1017df57e5e2de0633]]]
Former-commit-id: 2fc7f80939
Former-commit-id: 07dd7cfbce515d465564bc054b81cf7330f90242 [formerly eef1151c17]
Former-commit-id: 69e1b32d11
|
2013-06-10 15:07:59 -04:00 |
|
Steve Harris
|
f7316ae4bd
|
13.4.1-14 baseline
Former-commit-id: ffcce90f3f [formerly be236eb722] [formerly c749e122eb] [formerly 18b90226a2 [formerly c749e122eb [formerly 0e4ca3ea4159ea0256e22f9814f0de85180a41fb]]]
Former-commit-id: 18b90226a2
Former-commit-id: a7fc76319d4a743a6f6c8fc92e7f97e543ca980f [formerly dee685e3c7]
Former-commit-id: cebc1ddb63
|
2013-06-06 15:15:27 -04:00 |
|
Steve Harris
|
70ecafa237
|
13.4.1-13 baseline
Former-commit-id: 9a7ef48967 [formerly e3b8086bd0] [formerly 87b9712009] [formerly de476791fb [formerly 87b9712009 [formerly f79327d3865cb0fa7812d5fba896c1a46013badf]]]
Former-commit-id: de476791fb
Former-commit-id: 0455657ac09be5391a236a0b109f8e55687afaa3 [formerly b58cf237bf]
Former-commit-id: 418f8aef56
|
2013-05-29 16:30:09 -04:00 |
|
Steve Harris
|
fb41995981
|
13.4.1-12 baseline
Former-commit-id: 623f813923 [formerly 397bbf674a] [formerly 6a97b4325a] [formerly e53ada66b8 [formerly 6a97b4325a [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]]
Former-commit-id: e53ada66b8
Former-commit-id: 2f1cc0615a2004fad57c6bc60c7b79567c46436b [formerly bd4f93e859]
Former-commit-id: b745b332ae
|
2013-05-22 16:42:39 -04:00 |
|
Steve Harris
|
5db95cce55
|
13.4.1-11 baseline
Former-commit-id: 65d8f51034 [formerly d6319a2ca6] [formerly 2edee36158] [formerly c0376ce9ed [formerly 2edee36158 [formerly e414ae01ab52b3940647e46e22bba3b89790c142]]]
Former-commit-id: c0376ce9ed
Former-commit-id: d3627734c45f2b66baada7042aad74b4dccee3dc [formerly 6df093ef48]
Former-commit-id: 4d88863515
|
2013-05-21 09:19:25 -04:00 |
|
Steve Harris
|
ac83fff244
|
13.4.1-10 baseline
Former-commit-id: 294c127b0a [formerly 68fe2134b8] [formerly 9a403b3615] [formerly 92152778b9 [formerly 9a403b3615 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]]]
Former-commit-id: 92152778b9
Former-commit-id: 8c493e450ca4bda573630558025eb5e5d0941004 [formerly b1fc4e625b]
Former-commit-id: 7e04d8cd13
|
2013-05-20 10:52:47 -04:00 |
|
Steve Harris
|
7d55d0e959
|
13.4.1-9 baseline
Former-commit-id: 301821988e [formerly 88eee9cbfa] [formerly bcf7f15c90] [formerly aff41713f9 [formerly bcf7f15c90 [formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]]]
Former-commit-id: aff41713f9
Former-commit-id: b841f2e35f17e9dfe7719399d45daaa6c9bb3bc2 [formerly 0766ae20dd]
Former-commit-id: 67a95d07d2
|
2013-05-16 11:12:07 -04:00 |
|
Steve Harris
|
fddef92bf3
|
13.4.1-8 baseline
Former-commit-id: 02dba50c00 [formerly 576a74fe0b] [formerly 19866e7032] [formerly c59b52a266 [formerly 19866e7032 [formerly d130c847d4f9d0b491f9326c8b5140fb59174927]]]
Former-commit-id: c59b52a266
Former-commit-id: c60ffcebecebf9d637d3276980b24255a17f4079 [formerly a1c4cd2a39]
Former-commit-id: 5465764527
|
2013-05-14 09:21:41 -04:00 |
|
Steve Harris
|
6e1e454a9f
|
13.4.1-7 baseline
Former-commit-id: 81bc07bff4 [formerly 8072752c77] [formerly 4c6ff79e71] [formerly 8347bed50e [formerly 4c6ff79e71 [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]]
Former-commit-id: 8347bed50e
Former-commit-id: f3152ba9f38327cd1d37f2849c62a4d8c8652434 [formerly b35027f661]
Former-commit-id: ff7a21ac37
|
2013-05-13 12:58:10 -04:00 |
|
Steve Harris
|
5568ada76b
|
13.4.1-6 baseline
Former-commit-id: 5544c4a072 [formerly 6fcbb5ae6b] [formerly 8379977673] [formerly 16fe8cc5a2 [formerly 8379977673 [formerly f30c650b1c406889c38a5f82bbeda3605adbd9a5]]]
Former-commit-id: 16fe8cc5a2
Former-commit-id: f649c7ad7b4bf50f9a110308d2253393bb3d2506 [formerly 979700c302]
Former-commit-id: 5be793f2f9
|
2013-05-07 08:47:39 -04:00 |
|
Steve Harris
|
450dbb7e8d
|
13.4.1-5 baseline
Former-commit-id: 313481c30e [formerly aa9a719836] [formerly 85bbf6d242] [formerly 4ae0e2e858 [formerly 85bbf6d242 [formerly 2d978fe3d2cf99e04040d191e040dbcb84a60b9a]]]
Former-commit-id: 4ae0e2e858
Former-commit-id: 2eb97f64bb7ce7cc6616c74badc76ecc130a4aee [formerly aa4624c58f]
Former-commit-id: e0af96524f
|
2013-05-03 09:29:14 -05:00 |
|
Steve Harris
|
f83b6daf56
|
13.4.1-4.1 baseline (recovered lost bin directories for 13.4.1-4)
Former-commit-id: 29777b406e [formerly 344054d3e9] [formerly 1a6fd7edfd] [formerly 0f76c3cbee [formerly 1a6fd7edfd [formerly dca18e1b350f5424ec129b6cd0d602ceb86e119b]]]
Former-commit-id: 0f76c3cbee
Former-commit-id: 40a0e843311ddd470a12258a3bc95ce73d614c01 [formerly 99a7521fd6]
Former-commit-id: c1349f4a6d
|
2013-05-03 09:20:30 -05:00 |
|
Steve Harris
|
7d085660f8
|
13.4.1-4 baseline
Former-commit-id: ef5893b279 [formerly 99f4569650] [formerly d33e5861aa] [formerly 7a78f8ac6e [formerly d33e5861aa [formerly 4477bad886dc7ae0418409e3bc5ebce7965b6146]]]
Former-commit-id: 7a78f8ac6e
Former-commit-id: 0d136c3db2023f33ea2f1f9c8c67dab99b99d829 [formerly 7828293d32]
Former-commit-id: 4357e2dacc
|
2013-05-02 10:00:38 -05:00 |
|
Steve Harris
|
63a820bca5
|
13.4.1-3 baseline
Former-commit-id: 03ff5cd82c [formerly 3486902772] [formerly 54afedf617] [formerly 86e96f378c [formerly 54afedf617 [formerly 02412063da81fbfd3f1bbdd48700e1b1ccdeb4fd]]]
Former-commit-id: 86e96f378c
Former-commit-id: 9ed4bd11d8f4f59100814b197a573e16fc302211 [formerly 8a41dd2048]
Former-commit-id: 9fb6f3835c
|
2013-04-29 12:25:07 -05:00 |
|
Steve Harris
|
9f9d623cb7
|
13.4.1-2 baseline
Former-commit-id: 4533276dd5 [formerly 9212be8b74] [formerly 52f0ae4758] [formerly 5ebd58a0b3 [formerly 52f0ae4758 [formerly 8b85b1f1e96220b29e8c3b891f6df6a9633c3b4d]]]
Former-commit-id: 5ebd58a0b3
Former-commit-id: 742c1aa68303bc46ceb9dc5329e59d055f9196d4 [formerly 99bc8c8072]
Former-commit-id: 6880107d32
|
2013-04-24 17:22:10 -05:00 |
|
Steve Harris
|
aecc3cfd89
|
13.4.1-1 baseline
Former-commit-id: 79567aac51 [formerly f95e0ad10b] [formerly 2f517b7713] [formerly 00332e6305 [formerly 2f517b7713 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]]]
Former-commit-id: 00332e6305
Former-commit-id: fff69f92a60e6f16033e299ff1dd2395fac95290 [formerly 4accbb80db]
Former-commit-id: 0e950655f1
|
2013-04-24 17:15:55 -05:00 |
|
Steve Harris
|
f5ccd224d4
|
Merge branch 'master_13.3.1' into master_13.4.1
Former-commit-id: 9d57ad1675 [formerly 035878a846] [formerly 7957c52dec] [formerly e6d37f3e6d [formerly 7957c52dec [formerly 59bd064351a843fd514514de9dc942d13c6d7793]]]
Former-commit-id: e6d37f3e6d
Former-commit-id: 0cf541c2cb1fdf3ce52a0d77346996fa9e50b39b [formerly ad51361408]
Former-commit-id: e11088fefd
|
2013-04-15 09:34:45 -05:00 |
|
Steve Harris
|
1749ff8a3c
|
13.3.1-20 baseline
Former-commit-id: 9e73c3f1ed [formerly 07f7e6e2b4] [formerly 25432cc388] [formerly 446bec6f49 [formerly 25432cc388 [formerly 91210030e50e7a19c3d8d4c9d377494de2bc83dd]]]
Former-commit-id: 446bec6f49
Former-commit-id: 48c43f807cd6cab814e5d057a67effdc5c9ea638 [formerly 4b71131386]
Former-commit-id: 8535bceb4c
|
2013-04-15 08:58:59 -05:00 |
|
Steve Harris
|
fe5020d315
|
13.3.1-19 baseline
Former-commit-id: 196767d525 [formerly dc9fef33a9] [formerly 9be238bcc4] [formerly abaf9f12f9 [formerly 9be238bcc4 [formerly ce855032b2b7235b2aea8dc66aff89ca7c54854a]]]
Former-commit-id: abaf9f12f9
Former-commit-id: afa8971d2a4b49801835997c9e04d909cbb5917c [formerly 340a2cfb23]
Former-commit-id: ed4150db5f
|
2013-04-09 08:37:12 -05:00 |
|
Steve Harris
|
1a2b88cd38
|
Merge branch 'master_13.3.1' (13.3.1-18) into master_13.4.1
Initiating master_13.4.1 with 13.3.1-18
conflicts resolved by taking all of 13.3.1-18
Conflicts:
cave/com.raytheon.uf.viz.common.core.feature/feature.xml
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ReferenceSetManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
cave/com.raytheon.viz.product.awips/awips.product
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/AbstractDbSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIManager.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIState.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/hpcGuideNDFD.xml
edexOsgi/com.raytheon.edex.rpgenvdata/src/com/raytheon/edex/rpgenvdata/RPGEnvironmentalDataManager.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFMPProcessor.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTI.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
pythonPackages/pypies/pypies/impl/H5pyDataStore.py
Former-commit-id: 55655fdab9 [formerly 3487a41532] [formerly ea34b1db1e] [formerly d98a119f4d [formerly ea34b1db1e [formerly 735ce03302b54116c8545daf043585fb16fabd11]]]
Former-commit-id: d98a119f4d
Former-commit-id: 81f4469f3483d2aa0d3f210a9122ae238b69e5a7 [formerly 1a91fd82ff]
Former-commit-id: 3ea89862c0
|
2013-04-04 11:12:22 -05:00 |
|
Steve Harris
|
467ced2742
|
Merge AWIPS2 master branch (13.2.1-21) into master
Former-commit-id: 0187ed0d28 [formerly bf8a149596] [formerly 0676aa710a] [formerly 19bb737425 [formerly 0676aa710a [formerly a5433b05559621bce842ce98f68f9fd151109531]]]
Former-commit-id: 19bb737425
Former-commit-id: 563240b9b66c1c3fb6cbe62be623fb578421eae0 [formerly 8c5538c10c]
Former-commit-id: bf75c6aa20
|
2013-04-04 09:54:02 -05:00 |
|
Steve Harris
|
02eaa8f9be
|
Merge branch 'master_13.2.1' into master
Former-commit-id: 4f764d1bee [formerly c946213066] [formerly f0b9589c11] [formerly 9df0038ea3 [formerly f0b9589c11 [formerly 9d79a4e435d69849510f51b6ed8ac13f8eda438a]]]
Former-commit-id: 9df0038ea3
Former-commit-id: 869ae62b63ae4e331e1d7be46bb59b200970bb77 [formerly 10d1218035]
Former-commit-id: 18e517f361
|
2013-04-04 10:51:40 -04:00 |
|
Steve Harris
|
527c41b81e
|
Merge AWIPS2 master branch (13.2.1-19) into master
All conflicts overridden by 'theirs' merge - all of AWIPS2 master
Conflicts:
cave/com.raytheon.uf.viz.collaboration.pointdata/com.raytheon.uf.viz.collaboration.pointdata.ecl
cave/com.raytheon.uf.viz.collaboration.product.feature/com.raytheon.uf.viz.collaboration.product.feature.ecl
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowISCGridsAction.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.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.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIState.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
edexOsgi/com.raytheon.uf.common.datadelivery.registry/build.properties
edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/build.properties
edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/utility/edex_static/base/purge/convsigmetPurgeRules.xml
rpms/awips2.core/Installer.ldm/component.spec
Former-commit-id: fcb5db91f4 [formerly 4b2462390e] [formerly 4861007a03] [formerly dab32b0413 [formerly 4861007a03 [formerly 9cab4557a50e2bcda09365a86b54e5e5613f0a57]]]
Former-commit-id: dab32b0413
Former-commit-id: 56fd104754441c4f44c1479b829750c7abdf97ba [formerly 4bb5d51847]
Former-commit-id: 8a7bb1f4c8
|
2013-04-04 08:22:05 -05:00 |
|
Steve Harris
|
688327d314
|
13.2.1-21 baseline
Former-commit-id: 50106822ea [formerly a86d44584d] [formerly cf6ce2cede4f08c2e7976543017c522cfdf73446 [formerly d4358b93dc]] [formerly 33bd359cfe [formerly d4358b93dc [formerly f80eddbb15e5ca1710c15d245957345d6f840546]]]
Former-commit-id: 33bd359cfe
Former-commit-id: 09e2a7d813b8cb62d46bd89be26006f9864a8721 [formerly 18d6fa4f4d]
Former-commit-id: 5c029bc4ac
|
2013-04-03 18:08:41 -04:00 |
|
Steve Harris
|
3be498b2fc
|
13.2.1-20 baseline
Former-commit-id: 3aa43b1b0d [formerly ad663b925c] [formerly 6a55bc5dff] [formerly 539faf0a71 [formerly 6a55bc5dff [formerly 901c37ddfaeb0103160d0bbb2f1c2f623a16f73e]]]
Former-commit-id: 539faf0a71
Former-commit-id: 7dca551d593dd1f6e0032c2e45684997afece6da [formerly 12d4316b3a]
Former-commit-id: b062373048
|
2013-04-03 18:05:39 -04:00 |
|
Steve Harris
|
fd2de8135b
|
Merge branch 'master_13.2.1' into master
'theirs merge' - took all all master_13.2.1
Conflicts:
cave/com.raytheon.uf.viz.common.core.feature/feature.xml
cave/com.raytheon.uf.viz.core/META-INF/spring/viz.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/auth/UserController.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/CAVELocalizationAdapter.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.uf.viz.cots.feature/feature.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/AbstractAliasLevelNode.java
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.sounding/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/Activator.java
cave/com.raytheon.uf.viz.stats/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/GroupingComp.java
cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/IStatsDisplay.java
cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/SelectionManagerDlg.java
cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/StatsControlDlg.java
cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/StatsDisplayCanvas.java
cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/StatsGraphDlg.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/DefineRefSetDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/GridInfoDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.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/rsc/general/AbstractGridResource.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.pointdata/src/com/raytheon/viz/pointdata/util/PointMetadataContainer.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
cots/org.geotools/.classpath
cots/org.geotools/META-INF/MANIFEST.MF
cots/org.geotools/build.properties
cots/org.junit/.classpath
cots/org.junit/META-INF/MANIFEST.MF
cots/org.junit/build.properties
edexOsgi/build.edex/build.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/decoderpostprocessors/EnsembleGridAssembler.java
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/topo/StaticTopoData.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/topo/TopoAttributes.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/utility/common_static/base/grid/models/gribModels_ECMWF-98.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/models/gribModels_FSL-59.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/models/gribModels_NCEP-7.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/models/gribModels_NWSTG-8.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/models/gribModels_RFC-9.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/models/gribModels_RSMC-54.xml
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/models/gribModels_UKMET-74.xml
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/models/GribModels_FNMO-58.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/parameterInfo/hpcGuideNDFD.xml
edexOsgi/com.raytheon.edex.plugin.satellite/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.utilitysrv/src/com/raytheon/edex/services/AbstractPrivilegedLocalizationRequestHandler.java
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.grib/src/com/raytheon/uf/common/dataplugin/grib/StatusConstants.java
edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/subgrid/SubGridDef.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.dataplugin.level/utility/common_static/base/level/alias/gempak.xml
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.localization/src/com/raytheon/uf/common/localization/LocalizationFile.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/NwsRoleData.java
edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/xml/RoleXML.java
edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/xml/UserXML.java
edexOsgi/com.raytheon.uf.common.serialization.comm/src/com/raytheon/uf/common/serialization/comm/RequestRouter.java
edexOsgi/com.raytheon.uf.common.sounding/utility/edex_static/base/python/RaobPyUtil.py
edexOsgi/com.raytheon.uf.common.stats/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/AggregateRecord.java
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/GraphDataRequest.java
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/data/DataPoint.java
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/data/GraphData.java
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/data/StatsBin.java
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/data/StatsData.java
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/data/StatsEventData.java
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/util/UnitUtils.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/AbstractTimer.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/ITimer.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimerImpl.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.common.core.feature/feature.xml
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.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
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/GridDao.java
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.plugin.nwsauth/utility/common_static/base/roles/userRoles.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/data/StatsDataAccumulator.java
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/handler/GraphDataHandler.java
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/util/Archiver.java
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/util/ConfigLoader.java
edexOsgi/com.raytheon.uf.edex.stats/utility/edex_static/base/stats/edexProcessStats.xml
nativeLib/dist.native/i386-pc-linux-gnu.tar
ncep/gov.noaa.nws.ncep.viz.gempak.nativelib.linux32/libgpk_logs.so
ncep/gov.noaa.nws.ncep.viz.gempak.nativelib.linux32/libgpk_nologs.so
pythonPackages/pypies/pypies/impl/H5pyDataStore.py
Former-commit-id: 9379905195 [formerly 953d1697a9] [formerly 8bf7abcd71] [formerly 04d398beb4 [formerly 8bf7abcd71 [formerly c5f3a5bc748e16681283e12823a254376e307c66]]]
Former-commit-id: 04d398beb4
Former-commit-id: 60b1575b82af8fe5f398bec6e14787f0de50259b [formerly 1801c8a0c9]
Former-commit-id: 29d0a059dd
|
2013-04-03 17:38:24 -04:00 |
|
Steve Harris
|
b6f53af0bf
|
Merge branch 'master_13.1.2' into master
'theirs merge' - took all of master_13.1.2
Conflicts:
cave/com.raytheon.uf.viz.collaboration.pointdata/com.raytheon.uf.viz.collaboration.pointdata.ecl
cave/com.raytheon.uf.viz.collaboration.product.feature/com.raytheon.uf.viz.collaboration.product.feature.ecl
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
edexOsgi/com.raytheon.uf.common.parameter/build.properties
edexOsgi/com.raytheon.uf.common.spatial/build.properties
edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/utility/edex_static/base/purge/convsigmetPurgeRules.xml
Former-commit-id: 7a9ad0392e [formerly ec6f65d581] [formerly 20349e11b0] [formerly 4ff8c8967a [formerly 20349e11b0 [formerly b656a1ed430a571fbda029479ff457bb4405efc0]]]
Former-commit-id: 4ff8c8967a
Former-commit-id: e9b03748c5b3a0ff74a2cebeae786a2a00a71ef0 [formerly 6282e0fd39]
Former-commit-id: 49649155f2
|
2013-04-03 17:17:32 -04:00 |
|