Steve Harris
|
e4435815c9
|
13.3.1-1 baseline
Former-commit-id: 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: d2a654625f
Former-commit-id: 46d28be4a4
|
2013-02-20 16:19:40 -06:00 |
|
Steve Harris
|
9ec03fb946
|
13.2.1-9 baseline
Former-commit-id: 2dc4a4f50f [formerly a339cfb704] [formerly d6dc4694f0 [formerly 915d8edd4670b38df0474de72cf19c6d8b9aa1a3]]
Former-commit-id: d6dc4694f0
Former-commit-id: 03e04cbcca
|
2013-02-20 14:11:20 -05:00 |
|
Steve Harris
|
9a90ba3d07
|
Merge branch 'master_13.2.1' into master_13.3.1
Former-commit-id: bbc1b6fb55 [formerly 1b631ebb9a] [formerly b29c0b805f [formerly 8584d078529382aadd9f1eac527f89ea58808df1]]
Former-commit-id: b29c0b805f
Former-commit-id: 15e9481838
|
2013-02-18 12:39:53 -06:00 |
|
Steve Harris
|
8cffb55371
|
13.2.1-8 baseline
Former-commit-id: 18da2e93d7 [formerly f81b382c04] [formerly 053156f02e [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]
Former-commit-id: 053156f02e
Former-commit-id: c6d584758f
|
2013-02-18 09:09:41 -06:00 |
|
Steve Harris
|
58bafc0068
|
13.2.1-8 baseline
Former-commit-id: da707ff25c [formerly 27d88edcb9] [formerly 535a9402a7 [formerly 1da0393f24829256c090d06ea8f7a0eca5e68bfd]]
Former-commit-id: 535a9402a7
Former-commit-id: a68ce64f45
|
2013-02-18 09:23:06 -05:00 |
|
Steve Harris
|
c75b30c245
|
13.2.1-7 baseline
Merge branch 'master_13.2.1' into master_13.3.1
Conflicts solved with 'theirs' strategy (all of 13.2.1-7)
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/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: a67564bea7 [formerly a53a44d42c] [formerly d9028f55d3 [formerly 1108d28cc473cd1b6be7ec5c78e78c7b6d1ea56f]]
Former-commit-id: d9028f55d3
Former-commit-id: 5bf55de767
|
2013-02-14 13:55:35 -06:00 |
|
Steve Harris
|
a491a84615
|
13.1.1-10 baseline
Former-commit-id: baa5de2147 [formerly 06d0e6dd16] [formerly 9b73b6a2a9 [formerly 1e337899d45617a8ee1998f2d2c86f2912668b67]]
Former-commit-id: 9b73b6a2a9
Former-commit-id: c8c783f128
|
2013-02-14 13:24:43 -06:00 |
|
Steve Harris
|
57ccd18d85
|
13.1.1-10 baseline
Former-commit-id: eff75cc712 [formerly 56a36af0c2] [formerly 986c332e69 [formerly d5639bcdf900c60d883eb975e3062ebc55803da1]]
Former-commit-id: 986c332e69
Former-commit-id: fa962f98a4
|
2013-02-14 14:11:00 -05:00 |
|
Steve Harris
|
6780b60df5
|
13.2.1-7 baseline
Former-commit-id: 0b7287b130 [formerly 6fad5da5ed] [formerly 9c23bf6e73 [formerly fa14e53e7a52c1c69c37e60a8df0b8be03db9bd2]]
Former-commit-id: 9c23bf6e73
Former-commit-id: 6bfbfc8a5e
|
2013-02-12 14:51:26 -06:00 |
|
Steve Harris
|
4bc81ce1de
|
13.2.1-7 baseline
Former-commit-id: 370b2558f0 [formerly 1ce95d1df2] [formerly c86246ab4d [formerly 132297ab4acf8e649e3cf9a3d54d4f4676b280be]]
Former-commit-id: c86246ab4d
Former-commit-id: 37be2e3f23
|
2013-02-11 16:50:39 -05:00 |
|
Steve Harris
|
bbe92e6824
|
13.2.1-6 baseline
Former-commit-id: d66ad2f77b [formerly d0752de66c] [formerly a46e33f06e [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]
Former-commit-id: a46e33f06e
Former-commit-id: 30d38334cc
|
2013-02-07 16:00:39 -06:00 |
|
Steve Harris
|
1f44caaedb
|
13.2.1-6 baseline
Former-commit-id: cc48fa4fc6 [formerly b80782b081] [formerly 53adfb7345 [formerly 2bdf04a09ff6a145eb73f5ad5c1e5140c8a3e0d0]]
Former-commit-id: 53adfb7345
Former-commit-id: dee1480773
|
2013-02-07 16:38:44 -05:00 |
|
Steve Harris
|
72ca459f76
|
13.2.1-5 baseline
Former-commit-id: d6a9d68c10 [formerly a11ab8f26e] [formerly d26a488ee4 [formerly d117c677ade20193836680bc7905ba7bbf9c67b2]]
Former-commit-id: d26a488ee4
Former-commit-id: 4a745c9483
|
2013-02-04 16:31:26 -06:00 |
|
Steve Harris
|
39cb931bc9
|
13.2.1-5 baseline
Former-commit-id: 1a74d2f0c5 [formerly b4014794de] [formerly f99f99e2f5 [formerly 7a6958217f8b67edac937a23cb1c2ae8a89cedce]]
Former-commit-id: f99f99e2f5
Former-commit-id: 418d8ca0d8
|
2013-02-04 16:36:29 -05:00 |
|
Steve Harris
|
3f25b862c8
|
13.2.1-4 baseline
Former-commit-id: ae2859d5a2 [formerly 8f2e7d4437] [formerly 0d7f53b6f4 [formerly d4fd198979dbc5d77a6bf836685cb658e7ac6cfe]]
Former-commit-id: 0d7f53b6f4
Former-commit-id: 2998f750f4
|
2013-01-31 11:40:31 -06:00 |
|
Steve Harris
|
06f4b4ad5a
|
13.2.1-4 baseline
Former-commit-id: f2b28cfa56 [formerly 1beb655fa0] [formerly 1e77a6f0bd [formerly 7a04400ebdaabfd380fc9fc0f1dae119f49e59ee]]
Former-commit-id: 1e77a6f0bd
Former-commit-id: e6e4de6247
|
2013-01-31 12:05:59 -05:00 |
|
Steve Harris
|
2f15451195
|
Set branch 'master_13.2.1' to 13.2.1-3
Former-commit-id: 34af4107ec [formerly 431c87fd41] [formerly 6970a8ab46 [formerly 8955b95e1587317abef2b1ca2a15ea801acd055a]]
Former-commit-id: 6970a8ab46
Former-commit-id: c1ec7ca271
|
2013-01-24 10:20:13 -06:00 |
|
Steve Harris
|
a02662c13f
|
Set branch 'master' to 12.12.1-12
Former-commit-id: bfd5c7f19c [formerly a01f56909c] [formerly 71694006b1 [formerly 0bc0387279a73fa3175ada3a827e83b9ca2f58a4]]
Former-commit-id: 71694006b1
Former-commit-id: 610b9dc2d8
|
2013-01-23 15:41:59 -06:00 |
|
Steve Harris
|
9d248cff7a
|
13.2.1-3 baseline
Former-commit-id: a5a0da5c02 [formerly 7435527b25] [formerly 2b6ac028bd [formerly ba03739c3528638c5383528fd64674ae5af1ed64]]
Former-commit-id: 2b6ac028bd
Former-commit-id: cc0fdef15c
|
2013-01-23 11:24:17 -05:00 |
|
Steve Harris
|
d9be4dce21
|
13.2.1-2 baseline
Former-commit-id: 33bc5fd816 [formerly 83e9157df7] [formerly 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]
Former-commit-id: 328c6dccad
Former-commit-id: 47cc08ac79
|
2013-01-23 11:18:44 -05:00 |
|
Steve Harris
|
8ed6a53113
|
13.2.1-1 baseline
Former-commit-id: 48d1aa7732 [formerly 9771dfae6b] [formerly c63f9bcae0 [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]
Former-commit-id: c63f9bcae0
Former-commit-id: f6670806bf
|
2013-01-23 11:13:03 -05:00 |
|
Steve Harris
|
39f9dc931a
|
13.1.2-10 baseline
Former-commit-id: 683193255d [formerly 68dde17de2] [formerly 86ea0b666e [formerly 5a6d030d358519ca30fc37bf4a090a00557422a3]]
Former-commit-id: 86ea0b666e
Former-commit-id: d148beb4ca
|
2013-01-18 10:37:25 -05:00 |
|
Steve Harris
|
5b752c12c4
|
13.1.2-9 baseline
Former-commit-id: 6fd587d08d [formerly 0878a7ea57] [formerly ddc6aec013 [formerly da5b6c5b6999445b5ded541aac1bbdb46f0d322d]]
Former-commit-id: ddc6aec013
Former-commit-id: 5e0a9a8fd2
|
2013-01-18 10:29:52 -05:00 |
|
Steve Harris
|
7d0109a349
|
13.1.2-8 baseline
Former-commit-id: b864fdc303 [formerly e6217a17de] [formerly 06b8eb8db0 [formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]
Former-commit-id: 06b8eb8db0
Former-commit-id: 3caf592e83
|
2013-01-11 16:19:07 -05:00 |
|
Steve Harris
|
f1256f2a9e
|
13.1.2-7 baseline
Former-commit-id: a8d90da9c0 [formerly 4f86b07eb0] [formerly 42189b5f88 [formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]
Former-commit-id: 42189b5f88
Former-commit-id: b7f1dbe72b
|
2013-01-11 16:12:09 -05:00 |
|
Steve Harris
|
82a1ed77a4
|
13.1.2-6 baseline
Former-commit-id: efd3392abe [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]
Former-commit-id: 59969775ad
Former-commit-id: dbcae57f57
|
2013-01-06 14:55:11 -06:00 |
|
Steve Harris
|
cd4185ef5c
|
13.1.2-2 baseline
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 941337c553
|
2013-01-06 14:32:24 -06:00 |
|
Steve Harris
|
69ab975fab
|
12.12.1-12 baseline
Former-commit-id: 89def5cf03 [formerly e8e41630e8] [formerly 6d610f8e8a [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]
Former-commit-id: 6d610f8e8a
Former-commit-id: 7bb37caa23
|
2012-12-06 09:18:28 -06:00 |
|
Steve Harris
|
8a41d325d2
|
12.12.1-10 baseline
Former-commit-id: c7ec50d4f9 [formerly 45f5150eb6] [formerly 28018b8d9b [formerly 07d77ee5ca986f9762ec9c3276e8320e3f363ebc]]
Former-commit-id: 28018b8d9b
Former-commit-id: 0c67cb78a3
|
2012-12-06 09:12:15 -06:00 |
|
Steve Harris
|
ff4131c2ee
|
12.12.1-8 baseline
Former-commit-id: 2d338b4cec [formerly 19962f41ba] [formerly 5093a7c442 [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]
Former-commit-id: 5093a7c442
Former-commit-id: ee06a94735
|
2012-12-06 09:02:51 -06:00 |
|
Steve Harris
|
e35a321a8c
|
12.12.1-4 baseline
Former-commit-id: b91b7f0fae [formerly 85130eb611] [formerly 57578da521 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]
Former-commit-id: 57578da521
Former-commit-id: 628ca9e5c6
|
2012-11-14 14:19:20 -06:00 |
|
Steve Harris
|
2e3662028f
|
12.12.1-3 baseline
Former-commit-id: a81c46987b [formerly c999505fba] [formerly b3b5e6d28f [formerly 8481c91f9918a61631198331c324c4c5a76aac0f]]
Former-commit-id: b3b5e6d28f
Former-commit-id: 2797cbcdd0
|
2012-11-13 17:27:04 -06:00 |
|
Steve Harris
|
111e7607cf
|
12.12.1-2 baseline
Former-commit-id: ed809a02db [formerly a8560580f8] [formerly 6868eb9b23 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]
Former-commit-id: 6868eb9b23
Former-commit-id: df89fe9bed
|
2012-11-13 17:14:24 -06:00 |
|
Steve Harris
|
4f243de928
|
12.12.1-1 baseline
Former-commit-id: c2839cc86d [formerly e4bd20a515] [formerly e1498006c7 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]
Former-commit-id: e1498006c7
Former-commit-id: 214fcd3b63
|
2012-11-07 12:41:20 -06:00 |
|
Steve Harris
|
d8b6157aab
|
12.11.1-12 baseline
Former-commit-id: 565756567f [formerly 8682e4f6ca] [formerly 9ff9cb8aa3 [formerly 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f]]
Former-commit-id: 9ff9cb8aa3
Former-commit-id: 314c03e7b6
|
2012-10-29 12:15:56 -05:00 |
|
Steve Harris
|
61224dec54
|
12.11.1-10 baseline
Former-commit-id: 63dddc5f5f [formerly e845c605e6] [formerly 0ba69044a2 [formerly 9dd41e6322bad3e7dced1a32867d9a7f886d70cf]]
Former-commit-id: 0ba69044a2
Former-commit-id: cc21977c35
|
2012-10-24 15:13:57 -05:00 |
|
Steve Harris
|
efba080b9c
|
12.11.1-7 baseline
Former-commit-id: 40a5bc1683 [formerly d8ca6b9005] [formerly 79a5638de9 [formerly 59b9a93267bcf7b82fdefc55784289f7510117d0]]
Former-commit-id: 79a5638de9
Former-commit-id: cfd228f0d7
|
2012-10-23 16:40:50 -05:00 |
|
Steve Harris
|
8beb6fc0b8
|
12.11.1-6 baseline
Former-commit-id: 30c786a885 [formerly fba4a443a0] [formerly 5c1f3cdc46 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]
Former-commit-id: 5c1f3cdc46
Former-commit-id: 08fc9f6b14
|
2012-10-18 15:53:01 -05:00 |
|
Steve Harris
|
85ad066b70
|
12.11.1-5 baseline
Former-commit-id: 362d6ffaca [formerly 03f3f3c36a] [formerly a0eaf651ff [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]
Former-commit-id: a0eaf651ff
Former-commit-id: e31c1e5bba
|
2012-10-18 15:46:42 -05:00 |
|
Steve Harris
|
2c82d9cb07
|
12.11.1-4 baseline
Former-commit-id: 98171b5de9 [formerly d3497e47eb] [formerly 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: 6958b861f0
Former-commit-id: cbbdb231ce
|
2012-10-16 13:27:07 -05:00 |
|
Steve Harris
|
725b2f8ba5
|
12.11.1-3 baseline
Former-commit-id: 196afa0e5f [formerly 2d0c424713] [formerly 5d796f775c [formerly 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86]]
Former-commit-id: 5d796f775c
Former-commit-id: 5723fb0031
|
2012-10-15 16:30:31 -05:00 |
|
Steve Harris
|
772c60efa4
|
12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b
Former-commit-id: 75901860c2 [formerly c12ee14e66] [formerly 1e02387ff1 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]
Former-commit-id: 1e02387ff1
Former-commit-id: 42bf60b2fc
|
2012-10-08 13:26:20 -05:00 |
|
Steven Harris
|
f5e63d5f93
|
12.11.1-1 baseline
Former-commit-id: 0e86bfd1d3 [formerly 618aa3f316] [formerly feec28f274 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]
Former-commit-id: feec28f274
Former-commit-id: 8843ffd022
|
2012-09-27 15:57:45 -05:00 |
|
Steve Harris
|
f4e218c4dd
|
12.10.1-8 baseline
Former-commit-id: b062e4de8f [formerly dbd73151ca] [formerly 73d29311d0 [formerly 8a4573f57ba9a05d26f91070346050f66d94a58d]]
Former-commit-id: 73d29311d0
Former-commit-id: 94137c6ba1
|
2012-09-25 10:26:58 -05:00 |
|
Steve Harris
|
b18e5b5f2e
|
12.10.1-7 baseline
Former-commit-id: 2ee78eaf6d [formerly b754630136] [formerly 7b37cfca85 [formerly 161fb1c0295ff4aa3b78d06ae248255d77a4e886]]
Former-commit-id: 7b37cfca85
Former-commit-id: 30592ab872
|
2012-09-25 10:21:10 -05:00 |
|
Steve Harris
|
0e77eb2fe2
|
12.10.1-6 baseline
Former-commit-id: 81d91a8289 [formerly cebe6534ae] [formerly ba648f8e72 [formerly b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc]]
Former-commit-id: ba648f8e72
Former-commit-id: 5d5a61bd75
|
2012-09-25 10:14:23 -05:00 |
|
Steve Harris
|
a903893a09
|
12.10.1-5 baseline
Former-commit-id: 82feb4de50 [formerly a96d35a1fa] [formerly 4fd8893e55 [formerly 28dc700c3ef97a134c8871c2c52086fe7db43035]]
Former-commit-id: 4fd8893e55
Former-commit-id: deed84c1a2
|
2012-09-17 15:42:31 -05:00 |
|
Steve Harris
|
fa7d2ba33b
|
Merge branch 'ss_builds' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into ss_builds
Former-commit-id: 790af9ec63 [formerly 13adee3fe9] [formerly b06a9469b1 [formerly f17d5e913412e959e1f950bbd8e07516508f651f]]
Former-commit-id: b06a9469b1
Former-commit-id: 1c21fe109f
|
2012-09-17 08:18:31 -05:00 |
|
Bryan Kowal
|
dba734953b
|
Fix the git ignore file
Former-commit-id: 40e2924ce0 [formerly 2e1fe9663c] [formerly 4d7cb017ce [formerly 667a1c4eb019c27679ad8391608d852745ffa898]]
Former-commit-id: 4d7cb017ce
Former-commit-id: 079e3f926e
|
2012-09-14 12:04:24 -05:00 |
|
Steve Harris
|
f641cdd4e0
|
12.10.1-4 baseline
Former-commit-id: 9cd1f3ec0f [formerly 791ef6cedf] [formerly 92cc2d8605 [formerly ce574eeff1d197862c8aac2d3fc838a452862576]]
Former-commit-id: 92cc2d8605
Former-commit-id: b4d2a0e8dd
|
2012-09-13 12:33:36 -05:00 |
|