Loubna.Bousaidi
|
fe1c94a422
|
ASM #85
Change-Id: I782bbebc746425446c523b6b4db026d81f85b2da
Former-commit-id: 55d8f64139 [formerly 4d7d62ed986a781fb225775d2446740453bd8c89]
Former-commit-id: e3168d08cf
|
2014-02-11 22:12:48 +00:00 |
|
Loubna.Bousaidi
|
43d3e156a7
|
ASM #250
Change-Id: I81033a3a597e63f1ad53a7a1cefc4a775297f513
Former-commit-id: 176de0262c [formerly 0d1bad67bc93e356e26d2b0f3e411d3e751aa9f4]
Former-commit-id: 44e04ffef0
|
2014-02-07 15:15:58 +00:00 |
|
Juliya Dynina
|
3edd73f78c
|
Merge "ASM #114" into asm_14.2.2
Former-commit-id: c6253811e8 [formerly d719e88d510424020955f06d8b597d2df3573836]
Former-commit-id: 575ed3610d
|
2014-02-05 10:42:30 -05:00 |
|
Juliya Dynina
|
ad1ff832d2
|
Merge "ASM #235" into asm_14.2.2
Former-commit-id: 67942aacf7 [formerly 46beee6bbda9af256daecd64b4c7abf52e021ad3]
Former-commit-id: 08741ce6c4
|
2014-02-04 15:55:59 -05:00 |
|
steve.naples
|
b7b5dc3497
|
ASM #235
Change-Id: Ic3a6237b0a1f9ddf06621c984d2f11b7e08d7adb
Former-commit-id: 22808af7e2 [formerly 678ad5b35f22b71f54200fbf5b88ebd9e4da9563]
Former-commit-id: c76099274a
|
2014-02-04 18:23:46 +00:00 |
|
David Friedman
|
24ebf8854c
|
ASM #240
Change-Id: Ie1e0b115e991c0bdc01e929a21d36a9f1413d940
Former-commit-id: 969c50b80f [formerly e34ceb8c86f0814c1be7af3bbd2eadec8daf48aa]
Former-commit-id: 611503cd96
|
2014-02-03 19:03:50 +00:00 |
|
Juliya Dynina
|
df338a3302
|
Merge "ASM #290" into asm_14.2.2
Former-commit-id: a3ac0236b0 [formerly 3a31872714dbc04cfd7a0f1e353970b896b047a7]
Former-commit-id: 8cdc5b446a
|
2014-01-31 09:13:33 -05:00 |
|
Juliya Dynina
|
060fb2bd00
|
Merge "ASM #120" into asm_14.2.2
Former-commit-id: 5867a062d7 [formerly 30a875b35b090132cc6ec8a2474b5877bb7c6042]
Former-commit-id: 15c4ec933c
|
2014-01-31 09:12:20 -05:00 |
|
steve.naples
|
7ecb7b027c
|
ASM #290
Change-Id: Id6160e628c4fe3c4c62ef58ccb2b7624268e64d4
Former-commit-id: d4a0b7a0d1 [formerly 53b6ac674a3b7bbce71ce2a81b5bb3715baeaa13]
Former-commit-id: 6501c2c398
|
2014-01-30 21:03:38 +00:00 |
|
steve.naples
|
56deadaa00
|
ASM #120
Change-Id: I657d872f612475ccf21cdd3c08f8075180ec192a
Former-commit-id: b303d1ecbb [formerly 656f31b7df8a805e7f38a02c29bce05a1bcff639]
Former-commit-id: 709dc589ce
|
2014-01-30 20:59:39 +00:00 |
|
Juliya Dynina
|
33f10e0975
|
Merge "ASM #110" into asm_14.2.2
Former-commit-id: c26a2d5cab [formerly aa8647f0479204a43bf50fc498a26768a2feb989]
Former-commit-id: a28662b25d
|
2014-01-30 15:34:16 -05:00 |
|
David Friedman
|
d36cbb2ca9
|
ASM #110
Change-Id: I9df0f0491fa96ecb4c8f46125d987179f3aefc2f
Former-commit-id: e18c49ea72 [formerly c4b3411f4d5f7632e3c804316bd5959d16cc97f0]
Former-commit-id: 769086c0b7
|
2014-01-29 20:23:55 +00:00 |
|
Michael Gamazaychikov
|
2c2b629206
|
ASM #75
Change-Id: If2e1c8bc2d320b3681f64d8637fbabb9659d0c5b
Former-commit-id: edbadf059e [formerly e726b2a3a2529f5909acb7fe0f9a3b8475f1642e]
Former-commit-id: 91c3468462
|
2014-01-29 14:19:52 -05:00 |
|
Michael Gamazaychikov
|
297d1cffc6
|
ASM #114
Change-Id: I6308422a99e66701852e3b6de6c89b756513ef02
Former-commit-id: 8f90c0dee2 [formerly 56dc40096e58fa8ae40b9f2cd6a1bd8f9dd3d35a]
Former-commit-id: 97f9c2ea92
|
2014-01-29 10:58:18 -05:00 |
|
brian.dyke
|
4a62e83835
|
merge 14.2.1-3 into asm-14.2.2
Former-commit-id: f10f6d4e8a [formerly a116be206fc8a24dd12610db37db6f26c65a19b0]
Former-commit-id: 2294c81a57
|
2014-01-27 15:27:49 -05:00 |
|
Paul.Grell
|
9f4257bf91
|
ASM #252
Change-Id: I028f40785380d4484a55576d993b31550f2ed9d6
Former-commit-id: 9dee5cf94c [formerly e214471a696ba0613040b4c59e10297121ce2ad8]
Former-commit-id: 5d01400fca
|
2014-01-27 09:20:46 -05:00 |
|
Paul.Grell
|
0d2e66da84
|
ASM #252
Former-commit-id: ebc7eddb0a [formerly c6b313ed233128f14766d39d075dc363e3c8a50d]
Former-commit-id: 96d0095bc1
|
2014-01-27 09:14:21 -05:00 |
|
Paul.Grell
|
01afb7dc21
|
ASM #252
Change-Id: Ic8d441678c4850e86e554f26e8a0a22c3abfadc7
Former-commit-id: c2ab65391b [formerly d6f8de871856dd2b2386c29a1d3d7c030dbdd605]
Former-commit-id: ebea84a610
|
2014-01-27 09:10:31 -05:00 |
|
Paul.Grell
|
36b8fe1e40
|
ASM #252
Former-commit-id: 4217bf30c0 [formerly 3942a0518195910b45a0f437f1c978cac04f0361]
Former-commit-id: 393fc09e28
|
2014-01-24 15:07:13 -05:00 |
|
Paul.Grell
|
3d6d4ad799
|
Issue #252
Change-Id: I0923bde092c745d2def596bbe7c089f24e104e3c
Former-commit-id: f331f33c98 [formerly bb40b863e1cc7c6361967f279a14b4a161ae6903]
Former-commit-id: bb694192a6
|
2014-01-24 12:44:24 -05:00 |
|
Paul.Grell
|
79a963d37d
|
Issue #252
Change-Id: Ia3c606b84614a119213547ea34b2e51eac5963b5
Former-commit-id: 1428c1c651 [formerly ba1e7001941690d312310f0564cc96ed98681c2c]
Former-commit-id: 0e5bca8b1b
|
2014-01-24 12:36:12 -05:00 |
|
Juliya Dynina
|
64f3b1bb1f
|
Merge "Issue #96" into master_14.2.1
Former-commit-id: 7d99f46370 [formerly 25192d850366917824a82628a4cc90d5be2bad37]
Former-commit-id: efb81d6c4c
|
2014-01-24 11:07:22 -05:00 |
|
Paul.Grell
|
14f7fce482
|
Issue #252
Change-Id: I796c7da453e671023db088d698dca9cdc363451f
Former-commit-id: 34d4fe5baf [formerly 1e2d629bb13ee030980f3a93f0785c05a50933e0]
Former-commit-id: 6af2e7208c
|
2014-01-24 10:42:32 -05:00 |
|
Paul.Grell
|
07b2b638fd
|
Issue #252
Change-Id: I298ff674cfedf88d862e43bcaf691bd071daaec1
Former-commit-id: 5452a0ece5 [formerly 12a73264e81713f139dee219c2a4ef016ab71d8a]
Former-commit-id: adbb1cbd21
|
2014-01-24 10:36:04 -05:00 |
|
Paul.Grell
|
5ba8ad523a
|
Merge "Issue #252" into master_14.2.1
Former-commit-id: e0f20042ab [formerly 4f42dce5205525c82883d2b6c1e86ca444655f9d]
Former-commit-id: 1eab9f8f5e
|
2014-01-24 09:20:50 -05:00 |
|
Paul.Grell
|
b2b9c46b60
|
Issue #252
Change-Id: I1f1361204f580dc6db7d73c079dc48988abbe269
Former-commit-id: 76d8312175 [formerly 3ee67aa5a878fc95df550812092f5e916ad05dd5]
Former-commit-id: b8c8b4252f
|
2014-01-24 09:07:44 -05:00 |
|
Paul.Grell
|
b5b9fb3a0a
|
Issue #252
Change-Id: Ibc4265a85e8aa88cc976590fbab3fa88179f0292
Former-commit-id: 9335a5a97b [formerly 2344fe4e26fad1e3e19a6052616b9d3561f00d3e]
Former-commit-id: 6597fa94a1
|
2014-01-23 16:25:22 -05:00 |
|
Paul.Grell
|
5d9c5bd47a
|
Issue #252
Change-Id: Ib29719fe74c2bfa9e0dd898ecbd4a3a01d0ebe14
Former-commit-id: 9665ab6b17 [formerly d828197fee41e10a76019c072f2beb066b2d5b60]
Former-commit-id: 160b285887
|
2014-01-23 16:10:51 -05:00 |
|
Kiran Shrestha
|
ef6c154f28
|
Issue #96
Change-Id: I9ad090ae29aa3f6bd32e448b94c3053f9d61429e
Former-commit-id: 9411bbbac5 [formerly 17a188a3440214cbfd913e854a093ceba287fff9]
Former-commit-id: 60e090a963
|
2014-01-23 18:49:16 +00:00 |
|
Matthew Howard
|
87c7f9b826
|
Merge "Issue #87" into master_14.2.1
Former-commit-id: 271f26fcfb [formerly 62acdd26ccb37f8037729d676228d416a0e22f1b]
Former-commit-id: 58589f9088
|
2014-01-21 12:43:14 -05:00 |
|
Gang.Zhang
|
899d9fd7bf
|
Issue #87
Change-Id: I49c00c29769ef11ee7105b1e61be151ccabf454d
Former-commit-id: f78affc6f5 [formerly 1fa6738632faf85e2f540e807e5f4a208e6ffa3c]
Former-commit-id: e1584eeb0c
|
2014-01-21 11:50:50 +00:00 |
|
Matthew Howard
|
8304216bbe
|
Merge "Issue #92" into master_14.2.1
Former-commit-id: 9fae7f2b8d [formerly 041e6db2ebf27664ee75f4e2da31e21827721fef]
Former-commit-id: 951004e5e5
|
2014-01-15 14:24:54 -05:00 |
|
Rici.Yu
|
f4fd057900
|
Issue #92
Change-Id: Ib8d12e9be787c9b5b41a776eb22bb4c4a8c2fc7d
Former-commit-id: a36e9b3219 [formerly c12f51881a565e2ec812e83e79b4bc59fbb5af1e]
Former-commit-id: ac72d56ae0
|
2014-01-15 11:48:36 -05:00 |
|
Matthew Howard
|
bb834fc9bf
|
Merge "Issue #112" into master_14.2.1
Former-commit-id: 7a36600a04 [formerly 1054241eeb4931982f295bc8a9927ffe1510a24d]
Former-commit-id: c1ff14017b
|
2014-01-15 11:45:32 -05:00 |
|
Zhidong.Hao
|
b86b5fc0ee
|
Issue #112
Change-Id: I674975b805661ad191c5b4af3ad7132371e1a479
Former-commit-id: 57e78b6a11 [formerly b937a25ac189024718ee7832386d20f79e1d63e0]
Former-commit-id: d61fe61466
|
2014-01-15 11:16:26 -05:00 |
|
Kevin P. Johnson
|
e795890344
|
Issue #245
Change-Id: I7fca90d9f039b46061bb12a28485c92e21c4fd85
Former-commit-id: 75dd01d768 [formerly e776776d797a80b059f00bd78dd0806b7b0f2241]
Former-commit-id: e10493f734
|
2014-01-15 14:02:07 +00:00 |
|
Matthew Howard
|
a9ac6ef900
|
Merge "Issue #106" into master_14.2.1
Former-commit-id: 456e07d8da [formerly 59f69bf99e624723de801fdd6c9e2f490a2106b7]
Former-commit-id: 5acedd1030
|
2014-01-14 13:45:16 -05:00 |
|
Zhidong.Hao
|
95a104be58
|
Issue #106
Change-Id: Ib33b9294d4fd50d1cd3a815c841d4744ec4ba691
Former-commit-id: f3f378bcdc [formerly 00e518eafbc5032d4e23128ac0c415d4f9c0ab79]
Former-commit-id: 04079da5ad
|
2014-01-14 12:02:11 -05:00 |
|
Steve Naples
|
f60d81202c
|
Issue #237
Change-Id: Iab0716c7e09739cbb4a525111eb34ecc0594a388
Former-commit-id: 62dfc1f0b2 [formerly 3f252c7aa8fc5598f3f74c376c713150793868e5]
Former-commit-id: c2667bd719
|
2014-01-14 16:38:44 +00:00 |
|
Steve Naples
|
aab6c0cc76
|
Issue #125
Change-Id: I677be3fa551206e6c8b024a1aef45edb2c4e18ba
Former-commit-id: 68ff510bc8 [formerly 6ddb1bb4204a1b405976720c9f48fc20ff84e7c4]
Former-commit-id: 1c983d481c
|
2014-01-14 16:30:19 +00:00 |
|
Ron Anderson
|
0bde38cef3
|
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 9f121ec921a2f8635c48f005ddb71787ad6bf166]
Former-commit-id: ba7a25a88f
|
2014-01-13 17:45:20 -06:00 |
|
Matthew Howard
|
71e136082b
|
Merge "Issue #100" into master_14.2.1
Former-commit-id: 8d0bae66e2 [formerly b377e3267da4cda9367bb0d0b6831c8027579e6a]
Former-commit-id: 30a0fe634d
|
2014-01-13 15:12:23 -05:00 |
|
Zhidong.Hao
|
6cb6519232
|
Issue #100
Change-Id: I31c56395a69d8b1a140e652b434149dd98207e81
Former-commit-id: a5280b938c [formerly f58eb9a800491de5850fa82a6e37b029f41ceb1c]
Former-commit-id: 7009311c86
|
2014-01-13 14:11:44 -05:00 |
|
Juliya Dynina
|
68d5188d77
|
Merge "Issue #123" into master_14.2.1
Former-commit-id: f36c0dd1e4 [formerly 3cedd2e13e6bfa454cc9c6a64f610150d4c72104]
Former-commit-id: 393dc5907a
|
2014-01-10 14:58:23 -05:00 |
|
Matthew Howard
|
a14146b67a
|
Merge "Issue #95" into master_14.2.1
Former-commit-id: c2adc31d2a [formerly d4a222fa74114ea25820d112c5a5cf786832a33e]
Former-commit-id: f1cc7fbef1
|
2014-01-10 13:12:12 -05:00 |
|
Gang.Zhang
|
ab9a7b925b
|
Issue #95
Change-Id: If9d3827df8c8d9e1798910113112415f98bdaa6b
Former-commit-id: 2b7b91c35b [formerly 35ae75bbd4f542e437879191873fece08a463d46]
Former-commit-id: 51f7643752
|
2014-01-10 17:31:29 +00:00 |
|
Qinglu.Lin
|
e52d03fd37
|
Issue #123
Change-Id: Iac88a9d04fce04b4f604fb3d29c6591c90d85a65
Former-commit-id: 14e34361db [formerly bbd87416db31892d00960da0d9076e265578dd43]
Former-commit-id: 1c2b48a66e
|
2014-01-09 14:13:25 -05:00 |
|
Matthew Howard
|
447a107aca
|
Merge "Issue #86" into master_14.2.1
Former-commit-id: cdc4e69257 [formerly 29b822524bcc5740c21b855c2967a3c06d7b4ab6]
Former-commit-id: 0a02d1ffbb
|
2014-01-08 14:08:11 -05:00 |
|
Steve Harris
|
f88ff2bde9
|
14.1.1-15 baseline
Former-commit-id: d8e5799328 [formerly cb8eca2a0dfc0e2348301e8d9932db824ecaf34c]
Former-commit-id: 8bbd803ace
|
2014-01-06 14:08:08 -05:00 |
|
Steve Harris
|
6df7c67f95
|
14.1.1-14 baseline
Former-commit-id: 9ef1c841b9 [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]
Former-commit-id: f2ad9da4eb
|
2014-01-06 14:02:30 -05:00 |
|