steve.naples
|
8aa160d694
|
ASM #290
Change-Id: Id6160e628c4fe3c4c62ef58ccb2b7624268e64d4
Former-commit-id: d4a0b7a0d1 [formerly 6501c2c398 [formerly 53b6ac674a3b7bbce71ce2a81b5bb3715baeaa13]]
Former-commit-id: 6501c2c398
Former-commit-id: 7ecb7b027c
|
2014-01-30 21:03:38 +00:00 |
|
steve.naples
|
f850a0f028
|
ASM #120
Change-Id: I657d872f612475ccf21cdd3c08f8075180ec192a
Former-commit-id: b303d1ecbb [formerly 709dc589ce [formerly 656f31b7df8a805e7f38a02c29bce05a1bcff639]]
Former-commit-id: 709dc589ce
Former-commit-id: 56deadaa00
|
2014-01-30 20:59:39 +00:00 |
|
Michael Gamazaychikov
|
94cd48fa70
|
ASM #75
Change-Id: If2e1c8bc2d320b3681f64d8637fbabb9659d0c5b
Former-commit-id: edbadf059e [formerly 91c3468462 [formerly e726b2a3a2529f5909acb7fe0f9a3b8475f1642e]]
Former-commit-id: 91c3468462
Former-commit-id: 2c2b629206
|
2014-01-29 14:19:52 -05:00 |
|
brian.dyke
|
becf6322c6
|
merge 14.2.1-3 into asm-14.2.2
Former-commit-id: f10f6d4e8a [formerly 2294c81a57 [formerly a116be206fc8a24dd12610db37db6f26c65a19b0]]
Former-commit-id: 2294c81a57
Former-commit-id: 4a62e83835
|
2014-01-27 15:27:49 -05:00 |
|
Paul.Grell
|
86e4018589
|
ASM #252
Change-Id: I028f40785380d4484a55576d993b31550f2ed9d6
Former-commit-id: 9dee5cf94c [formerly 5d01400fca [formerly e214471a696ba0613040b4c59e10297121ce2ad8]]
Former-commit-id: 5d01400fca
Former-commit-id: 9f4257bf91
|
2014-01-27 09:20:46 -05:00 |
|
Paul.Grell
|
9e6a69776c
|
ASM #252
Former-commit-id: ebc7eddb0a [formerly 96d0095bc1 [formerly c6b313ed233128f14766d39d075dc363e3c8a50d]]
Former-commit-id: 96d0095bc1
Former-commit-id: 0d2e66da84
|
2014-01-27 09:14:21 -05:00 |
|
Paul.Grell
|
b65130c398
|
ASM #252
Change-Id: Ic8d441678c4850e86e554f26e8a0a22c3abfadc7
Former-commit-id: c2ab65391b [formerly ebea84a610 [formerly d6f8de871856dd2b2386c29a1d3d7c030dbdd605]]
Former-commit-id: ebea84a610
Former-commit-id: 01afb7dc21
|
2014-01-27 09:10:31 -05:00 |
|
Paul.Grell
|
420a122721
|
ASM #252
Former-commit-id: 4217bf30c0 [formerly 393fc09e28 [formerly 3942a0518195910b45a0f437f1c978cac04f0361]]
Former-commit-id: 393fc09e28
Former-commit-id: 36b8fe1e40
|
2014-01-24 15:07:13 -05:00 |
|
Paul.Grell
|
46ab3b53d8
|
Issue #252
Change-Id: I0923bde092c745d2def596bbe7c089f24e104e3c
Former-commit-id: f331f33c98 [formerly bb694192a6 [formerly bb40b863e1cc7c6361967f279a14b4a161ae6903]]
Former-commit-id: bb694192a6
Former-commit-id: 3d6d4ad799
|
2014-01-24 12:44:24 -05:00 |
|
Paul.Grell
|
55ad1f724e
|
Issue #252
Change-Id: Ia3c606b84614a119213547ea34b2e51eac5963b5
Former-commit-id: 1428c1c651 [formerly 0e5bca8b1b [formerly ba1e7001941690d312310f0564cc96ed98681c2c]]
Former-commit-id: 0e5bca8b1b
Former-commit-id: 79a963d37d
|
2014-01-24 12:36:12 -05:00 |
|
Juliya Dynina
|
cefb1c72c5
|
Merge "Issue #96" into master_14.2.1
Former-commit-id: 7d99f46370 [formerly efb81d6c4c [formerly 25192d850366917824a82628a4cc90d5be2bad37]]
Former-commit-id: efb81d6c4c
Former-commit-id: 64f3b1bb1f
|
2014-01-24 11:07:22 -05:00 |
|
Paul.Grell
|
1f5d73f421
|
Issue #252
Change-Id: I796c7da453e671023db088d698dca9cdc363451f
Former-commit-id: 34d4fe5baf [formerly 6af2e7208c [formerly 1e2d629bb13ee030980f3a93f0785c05a50933e0]]
Former-commit-id: 6af2e7208c
Former-commit-id: 14f7fce482
|
2014-01-24 10:42:32 -05:00 |
|
Paul.Grell
|
20e427d25a
|
Issue #252
Change-Id: I298ff674cfedf88d862e43bcaf691bd071daaec1
Former-commit-id: 5452a0ece5 [formerly adbb1cbd21 [formerly 12a73264e81713f139dee219c2a4ef016ab71d8a]]
Former-commit-id: adbb1cbd21
Former-commit-id: 07b2b638fd
|
2014-01-24 10:36:04 -05:00 |
|
Paul.Grell
|
963e381b16
|
Merge "Issue #252" into master_14.2.1
Former-commit-id: e0f20042ab [formerly 1eab9f8f5e [formerly 4f42dce5205525c82883d2b6c1e86ca444655f9d]]
Former-commit-id: 1eab9f8f5e
Former-commit-id: 5ba8ad523a
|
2014-01-24 09:20:50 -05:00 |
|
Paul.Grell
|
d4825e1ddd
|
Issue #252
Change-Id: I1f1361204f580dc6db7d73c079dc48988abbe269
Former-commit-id: 76d8312175 [formerly b8c8b4252f [formerly 3ee67aa5a878fc95df550812092f5e916ad05dd5]]
Former-commit-id: b8c8b4252f
Former-commit-id: b2b9c46b60
|
2014-01-24 09:07:44 -05:00 |
|
Paul.Grell
|
1f15ac19f7
|
Issue #252
Change-Id: Ibc4265a85e8aa88cc976590fbab3fa88179f0292
Former-commit-id: 9335a5a97b [formerly 6597fa94a1 [formerly 2344fe4e26fad1e3e19a6052616b9d3561f00d3e]]
Former-commit-id: 6597fa94a1
Former-commit-id: b5b9fb3a0a
|
2014-01-23 16:25:22 -05:00 |
|
Paul.Grell
|
70a9d0e2df
|
Issue #252
Change-Id: Ib29719fe74c2bfa9e0dd898ecbd4a3a01d0ebe14
Former-commit-id: 9665ab6b17 [formerly 160b285887 [formerly d828197fee41e10a76019c072f2beb066b2d5b60]]
Former-commit-id: 160b285887
Former-commit-id: 5d9c5bd47a
|
2014-01-23 16:10:51 -05:00 |
|
Kiran Shrestha
|
7f90e774fa
|
Issue #96
Change-Id: I9ad090ae29aa3f6bd32e448b94c3053f9d61429e
Former-commit-id: 9411bbbac5 [formerly 60e090a963 [formerly 17a188a3440214cbfd913e854a093ceba287fff9]]
Former-commit-id: 60e090a963
Former-commit-id: ef6c154f28
|
2014-01-23 18:49:16 +00:00 |
|
Matthew Howard
|
d29ff38434
|
Merge "Issue #87" into master_14.2.1
Former-commit-id: 271f26fcfb [formerly 58589f9088 [formerly 62acdd26ccb37f8037729d676228d416a0e22f1b]]
Former-commit-id: 58589f9088
Former-commit-id: 87c7f9b826
|
2014-01-21 12:43:14 -05:00 |
|
Gang.Zhang
|
78c6613674
|
Issue #87
Change-Id: I49c00c29769ef11ee7105b1e61be151ccabf454d
Former-commit-id: f78affc6f5 [formerly e1584eeb0c [formerly 1fa6738632faf85e2f540e807e5f4a208e6ffa3c]]
Former-commit-id: e1584eeb0c
Former-commit-id: 899d9fd7bf
|
2014-01-21 11:50:50 +00:00 |
|
Matthew Howard
|
8825b9099b
|
Merge "Issue #92" into master_14.2.1
Former-commit-id: 9fae7f2b8d [formerly 951004e5e5 [formerly 041e6db2ebf27664ee75f4e2da31e21827721fef]]
Former-commit-id: 951004e5e5
Former-commit-id: 8304216bbe
|
2014-01-15 14:24:54 -05:00 |
|
Rici.Yu
|
18eec46389
|
Issue #92
Change-Id: Ib8d12e9be787c9b5b41a776eb22bb4c4a8c2fc7d
Former-commit-id: a36e9b3219 [formerly ac72d56ae0 [formerly c12f51881a565e2ec812e83e79b4bc59fbb5af1e]]
Former-commit-id: ac72d56ae0
Former-commit-id: f4fd057900
|
2014-01-15 11:48:36 -05:00 |
|
Matthew Howard
|
19ea9a39d8
|
Merge "Issue #112" into master_14.2.1
Former-commit-id: 7a36600a04 [formerly c1ff14017b [formerly 1054241eeb4931982f295bc8a9927ffe1510a24d]]
Former-commit-id: c1ff14017b
Former-commit-id: bb834fc9bf
|
2014-01-15 11:45:32 -05:00 |
|
Zhidong.Hao
|
19ed94a647
|
Issue #112
Change-Id: I674975b805661ad191c5b4af3ad7132371e1a479
Former-commit-id: 57e78b6a11 [formerly d61fe61466 [formerly b937a25ac189024718ee7832386d20f79e1d63e0]]
Former-commit-id: d61fe61466
Former-commit-id: b86b5fc0ee
|
2014-01-15 11:16:26 -05:00 |
|
Kevin P. Johnson
|
12e5cfe85c
|
Issue #245
Change-Id: I7fca90d9f039b46061bb12a28485c92e21c4fd85
Former-commit-id: 75dd01d768 [formerly e10493f734 [formerly e776776d797a80b059f00bd78dd0806b7b0f2241]]
Former-commit-id: e10493f734
Former-commit-id: e795890344
|
2014-01-15 14:02:07 +00:00 |
|
Matthew Howard
|
ba4abc9e09
|
Merge "Issue #106" into master_14.2.1
Former-commit-id: 456e07d8da [formerly 5acedd1030 [formerly 59f69bf99e624723de801fdd6c9e2f490a2106b7]]
Former-commit-id: 5acedd1030
Former-commit-id: a9ac6ef900
|
2014-01-14 13:45:16 -05:00 |
|
Zhidong.Hao
|
634d0fd90a
|
Issue #106
Change-Id: Ib33b9294d4fd50d1cd3a815c841d4744ec4ba691
Former-commit-id: f3f378bcdc [formerly 04079da5ad [formerly 00e518eafbc5032d4e23128ac0c415d4f9c0ab79]]
Former-commit-id: 04079da5ad
Former-commit-id: 95a104be58
|
2014-01-14 12:02:11 -05:00 |
|
Steve Naples
|
b0ab548349
|
Issue #237
Change-Id: Iab0716c7e09739cbb4a525111eb34ecc0594a388
Former-commit-id: 62dfc1f0b2 [formerly c2667bd719 [formerly 3f252c7aa8fc5598f3f74c376c713150793868e5]]
Former-commit-id: c2667bd719
Former-commit-id: f60d81202c
|
2014-01-14 16:38:44 +00:00 |
|
Steve Naples
|
5fe256b40d
|
Issue #125
Change-Id: I677be3fa551206e6c8b024a1aef45edb2c4e18ba
Former-commit-id: 68ff510bc8 [formerly 1c983d481c [formerly 6ddb1bb4204a1b405976720c9f48fc20ff84e7c4]]
Former-commit-id: 1c983d481c
Former-commit-id: aab6c0cc76
|
2014-01-14 16:30:19 +00:00 |
|
Ron Anderson
|
2e8cbade9f
|
Merge branch 'master_14.1.1' into solutions
Conflicts:
cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5
Former-commit-id: 62c445d872 [formerly ba7a25a88f [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]
Former-commit-id: ba7a25a88f
Former-commit-id: 0bde38cef3
|
2014-01-13 17:45:20 -06:00 |
|
Matthew Howard
|
ed6bf0f03d
|
Merge "Issue #100" into master_14.2.1
Former-commit-id: 8d0bae66e2 [formerly 30a0fe634d [formerly b377e3267da4cda9367bb0d0b6831c8027579e6a]]
Former-commit-id: 30a0fe634d
Former-commit-id: 71e136082b
|
2014-01-13 15:12:23 -05:00 |
|
Zhidong.Hao
|
9c1196d427
|
Issue #100
Change-Id: I31c56395a69d8b1a140e652b434149dd98207e81
Former-commit-id: a5280b938c [formerly 7009311c86 [formerly f58eb9a800491de5850fa82a6e37b029f41ceb1c]]
Former-commit-id: 7009311c86
Former-commit-id: 6cb6519232
|
2014-01-13 14:11:44 -05:00 |
|
Juliya Dynina
|
f1affcc3d2
|
Merge "Issue #123" into master_14.2.1
Former-commit-id: f36c0dd1e4 [formerly 393dc5907a [formerly 3cedd2e13e6bfa454cc9c6a64f610150d4c72104]]
Former-commit-id: 393dc5907a
Former-commit-id: 68d5188d77
|
2014-01-10 14:58:23 -05:00 |
|
Matthew Howard
|
802069ebe6
|
Merge "Issue #95" into master_14.2.1
Former-commit-id: c2adc31d2a [formerly f1cc7fbef1 [formerly d4a222fa74114ea25820d112c5a5cf786832a33e]]
Former-commit-id: f1cc7fbef1
Former-commit-id: a14146b67a
|
2014-01-10 13:12:12 -05:00 |
|
Gang.Zhang
|
0db12d547d
|
Issue #95
Change-Id: If9d3827df8c8d9e1798910113112415f98bdaa6b
Former-commit-id: 2b7b91c35b [formerly 51f7643752 [formerly 35ae75bbd4f542e437879191873fece08a463d46]]
Former-commit-id: 51f7643752
Former-commit-id: ab9a7b925b
|
2014-01-10 17:31:29 +00:00 |
|
Qinglu.Lin
|
fc823260ca
|
Issue #123
Change-Id: Iac88a9d04fce04b4f604fb3d29c6591c90d85a65
Former-commit-id: 14e34361db [formerly 1c2b48a66e [formerly bbd87416db31892d00960da0d9076e265578dd43]]
Former-commit-id: 1c2b48a66e
Former-commit-id: e52d03fd37
|
2014-01-09 14:13:25 -05:00 |
|
Matthew Howard
|
e28bbac72c
|
Merge "Issue #86" into master_14.2.1
Former-commit-id: cdc4e69257 [formerly 0a02d1ffbb [formerly 29b822524bcc5740c21b855c2967a3c06d7b4ab6]]
Former-commit-id: 0a02d1ffbb
Former-commit-id: 447a107aca
|
2014-01-08 14:08:11 -05:00 |
|
Steve Harris
|
c6cb11a5f4
|
14.1.1-15 baseline
Former-commit-id: d8e5799328 [formerly 8bbd803ace [formerly cb8eca2a0dfc0e2348301e8d9932db824ecaf34c]]
Former-commit-id: 8bbd803ace
Former-commit-id: f88ff2bde9
|
2014-01-06 14:08:08 -05:00 |
|
Steve Harris
|
94a748fa8d
|
14.1.1-14 baseline
Former-commit-id: 9ef1c841b9 [formerly f2ad9da4eb [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]]
Former-commit-id: f2ad9da4eb
Former-commit-id: 6df7c67f95
|
2014-01-06 14:02:30 -05:00 |
|
Matthew Howard
|
8423f8806b
|
Merge "Issue #234" into master_14.2.1
Former-commit-id: ed53132c4d [formerly f0ad72ba4c [formerly 6ac3184c14137a45396eb1b45ed7c6ce4a291b3a]]
Former-commit-id: f0ad72ba4c
Former-commit-id: 76690fb1d1
|
2013-12-24 11:41:42 -05:00 |
|
Juliya Dynina
|
2549eb60e6
|
Merge "Issue #108" into master_14.2.1
Former-commit-id: acb74fef04 [formerly 849db3c6b6 [formerly 3d02d349d8b86f75844826687255467d5ad1e4f2]]
Former-commit-id: 849db3c6b6
Former-commit-id: f8eb9286de
|
2013-12-24 10:09:24 -05:00 |
|
Steve Naples
|
1379b11585
|
Issue #108
Change-Id: Ibace852cec618503f0a58fb504f58a4ad9106001
Former-commit-id: ee4c282df3 [formerly 9324bece92 [formerly 5255505bb000e1ca212894e92de20f7d3cc41618]]
Former-commit-id: 9324bece92
Former-commit-id: 5ce519e976
|
2013-12-23 21:23:13 +00:00 |
|
Loubna.Bousaidi
|
6f4b4222b2
|
Issue #207
Change-Id: Ia50dedd9b2a8340403131596ebb0e73b21c5ba90
Former-commit-id: 226c767f96 [formerly 962ead39bb [formerly eabfef02dc20e810ca9731a77bb96d73a800503b]]
Former-commit-id: 962ead39bb
Former-commit-id: d5895a1ab0
|
2013-12-23 20:30:13 +00:00 |
|
Juliya Dynina
|
b7880c499b
|
Merge "Issue #117" into master_14.2.1
Former-commit-id: 6b7c88469c [formerly 6b5e8c49d9 [formerly 46a6facdf2894434c0787bd9f4b9f9e1cb7cc35f]]
Former-commit-id: 6b5e8c49d9
Former-commit-id: 2538556fc3
|
2013-12-23 09:18:36 -05:00 |
|
Juliya Dynina
|
cdc0764ffe
|
Merge "Issue #117" into master_14.2.1
Former-commit-id: 4eef15705b [formerly b83c80c046 [formerly ff8dcb6aface85849c91bc81f862ea4c382da19d]]
Former-commit-id: b83c80c046
Former-commit-id: 8e6c7a1e0c
|
2013-12-23 09:18:22 -05:00 |
|
Juliya Dynina
|
e9b0da51f6
|
Merge "Issue #114" into master_14.2.1
Former-commit-id: 602c076a35 [formerly 926c7a344b [formerly d57e57cc811b7738da296c33fb43818a6bc536d3]]
Former-commit-id: 926c7a344b
Former-commit-id: 3530a59676
|
2013-12-23 09:18:01 -05:00 |
|
Rici.Yu
|
0568c41fd6
|
Issue #86
Change-Id: Iccda23ba7bdfd0619adcd6333ae10f35dd1fdf7c
Former-commit-id: feda1354ca [formerly 2b011e9ead [formerly 38ae417a29d24e6ffc0f71cde94882989098903d]]
Former-commit-id: 2b011e9ead
Former-commit-id: 795cb798c6
|
2013-12-20 15:47:50 -05:00 |
|
David Friedman
|
846bc47100
|
Issue #114
Change-Id: I7fd218b0120fe8d8eb6ab535d6d07b40c6c0773d
Former-commit-id: fe50967163 [formerly 01d657fd50 [formerly cd136c3a57f7836606755ad9d1de7a3b8234d1d8]]
Former-commit-id: 01d657fd50
Former-commit-id: 6c1b1f33ee
|
2013-12-20 20:33:18 +00:00 |
|
Qinglu.Lin
|
37ebda7502
|
Issue #117
Change-Id: I83e97c43ab9c27a965a9329d5cc4d691c7e20dc2
Former-commit-id: cfc815af76 [formerly 6e1dd369a8 [formerly c877d3db7b960309def150343672757b59b353a3]]
Former-commit-id: 6e1dd369a8
Former-commit-id: 9eb26957f2
|
2013-12-20 14:31:16 -05:00 |
|
Qinglu.Lin
|
1d2628421c
|
Issue #117
Change-Id: I52293e2148fdc1fbfd22ad01e03d6d628cd1c09a
Former-commit-id: 5dc466443b [formerly db66cbb605 [formerly 6f197a78afa6a8760f852e94861950a230eaedcc]]
Former-commit-id: db66cbb605
Former-commit-id: 50732574aa
|
2013-12-20 14:21:54 -05:00 |
|